From 70b8cef318dcca26ea6d36ffd06b1176a2cf44a8 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 19 Aug 2013 16:55:56 +0200 Subject: [PATCH] Fixes #709, out-of-source builds from arbitrary directories --- CMakeLists.txt | 5 +++-- cmake/UUID-Config.cmake | 19 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d047faa6..5fcc152b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) project(OSRM) 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) if(IS_64_SYSTEM) @@ -15,8 +16,8 @@ endif(IS_64_SYSTEM) 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 - COMMAND ${CMAKE_COMMAND} -P - ${CMAKE_SOURCE_DIR}/cmake/UUID-Config.cmake + COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} + -P ${CMAKE_SOURCE_DIR}/cmake/UUID-Config.cmake DEPENDS ${CMAKE_SOURCE_DIR}/Util/UUID.cpp.in ${CMAKE_SOURCE_DIR}/cmake/UUID-Config.cmake diff --git a/cmake/UUID-Config.cmake b/cmake/UUID-Config.cmake index 3da918765..fce2e7466 100644 --- a/cmake/UUID-Config.cmake +++ b/cmake/UUID-Config.cmake @@ -1,12 +1,11 @@ -set(oldfile ${CMAKE_SOURCE_DIR}/../Util/UUID.cpp) -if (EXISTS ${oldfile}) - file(REMOVE_RECURSE ${oldfile}) +set(OLDFILE ${SOURCE_DIR}/Util/UUID.cpp) +if (EXISTS ${OLDFILE}) + file(REMOVE_RECURSE ${OLDFILE}) 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) -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 ) +CONFIGURE_FILE( ${SOURCE_DIR}/Util/UUID.cpp.in ${SOURCE_DIR}/Util/UUID.cpp )