Fixes #709, out-of-source builds from arbitrary directories
This commit is contained in:
		
							parent
							
								
									e1620b8fa2
								
							
						
					
					
						commit
						70b8cef318
					
				| @ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6) | |||||||
| set(CMAKE_EXPORT_COMPILE_COMMANDS ON) | set(CMAKE_EXPORT_COMPILE_COMMANDS ON) | ||||||
| project(OSRM) | project(OSRM) | ||||||
| include(FindPackageHandleStandardArgs) | include(FindPackageHandleStandardArgs) | ||||||
|  | set(HUGO "${CMAKE_CURRENT_SOURCE_DIR}") | ||||||
| 
 | 
 | ||||||
| TRY_RUN(SHARED_LIBRARY_PATH_TYPE SHARED_LIBRARY_PATH_INFO_COMPILED ${PROJECT_BINARY_DIR}/CMakeTmp ${PROJECT_SOURCE_DIR}/cmake/size.cpp OUTPUT_VARIABLE IS_64_SYSTEM) | TRY_RUN(SHARED_LIBRARY_PATH_TYPE SHARED_LIBRARY_PATH_INFO_COMPILED ${PROJECT_BINARY_DIR}/CMakeTmp ${PROJECT_SOURCE_DIR}/cmake/size.cpp OUTPUT_VARIABLE IS_64_SYSTEM) | ||||||
| if(IS_64_SYSTEM) | if(IS_64_SYSTEM) | ||||||
| @ -15,8 +16,8 @@ endif(IS_64_SYSTEM) | |||||||
| set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) | ||||||
| 
 | 
 | ||||||
| add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/UUID.cpp UUID.cpp.alwaysbuild | add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/UUID.cpp UUID.cpp.alwaysbuild | ||||||
|   COMMAND ${CMAKE_COMMAND} -P |   COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|     ${CMAKE_SOURCE_DIR}/cmake/UUID-Config.cmake |     -P ${CMAKE_SOURCE_DIR}/cmake/UUID-Config.cmake | ||||||
|   DEPENDS |   DEPENDS | ||||||
|     ${CMAKE_SOURCE_DIR}/Util/UUID.cpp.in |     ${CMAKE_SOURCE_DIR}/Util/UUID.cpp.in | ||||||
|   	${CMAKE_SOURCE_DIR}/cmake/UUID-Config.cmake |   	${CMAKE_SOURCE_DIR}/cmake/UUID-Config.cmake | ||||||
|  | |||||||
| @ -1,12 +1,11 @@ | |||||||
| set(oldfile ${CMAKE_SOURCE_DIR}/../Util/UUID.cpp) | set(OLDFILE ${SOURCE_DIR}/Util/UUID.cpp) | ||||||
| if (EXISTS ${oldfile}) | if (EXISTS ${OLDFILE}) | ||||||
| 	file(REMOVE_RECURSE ${oldfile}) | 	file(REMOVE_RECURSE ${OLDFILE}) | ||||||
| endif() | endif() | ||||||
|  | file(MD5 ${SOURCE_DIR}/createHierarchy.cpp MD5PREPARE) | ||||||
|  | file(MD5 ${SOURCE_DIR}/DataStructures/StaticRTree.h MD5RTREE) | ||||||
|  | file(MD5 ${SOURCE_DIR}/DataStructures/NodeInformationHelpDesk.h MD5NODEINFO) | ||||||
|  | file(MD5 ${SOURCE_DIR}/Util/GraphLoader.h MD5GRAPH) | ||||||
|  | file(MD5 ${SOURCE_DIR}/Server/DataStructures/QueryObjectsStorage.cpp MD5OBJECTS) | ||||||
| 
 | 
 | ||||||
| file(MD5 ${CMAKE_SOURCE_DIR}/../createHierarchy.cpp MD5PREPARE) | CONFIGURE_FILE( ${SOURCE_DIR}/Util/UUID.cpp.in ${SOURCE_DIR}/Util/UUID.cpp ) | ||||||
| file(MD5 ${CMAKE_SOURCE_DIR}/../DataStructures/StaticRTree.h MD5RTREE) |  | ||||||
| file(MD5 ${CMAKE_SOURCE_DIR}/../DataStructures/NodeInformationHelpDesk.h MD5NODEINFO) |  | ||||||
| file(MD5 ${CMAKE_SOURCE_DIR}/../Util/GraphLoader.h MD5GRAPH) |  | ||||||
| file(MD5 ${CMAKE_SOURCE_DIR}/../Server/DataStructures/QueryObjectsStorage.cpp MD5OBJECTS) |  | ||||||
| 
 |  | ||||||
| CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/../Util/UUID.cpp.in ${CMAKE_SOURCE_DIR}/../Util/UUID.cpp ) |  | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user