From c3dab15eb6cb599c5e90883813f52d5e7ceba5ec Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Thu, 18 Jul 2013 14:11:45 +0200 Subject: [PATCH] Several lookup fixes and fingerprinting of files with input IO, thx @alex85k --- CMakeLists.txt | 19 ++++++++++++++----- Util/UUID.config.h.in | 5 +++++ cmake/FindLuabind.cmake | 4 ++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4d7fd34d..32896c0f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.6) project(OSRM) include(FindPackageHandleStandardArgs) @@ -10,22 +10,29 @@ else(IS_64_SYSTEM) MESSAGE(WARNING "Compiling on a 32 bit system is unsupported!") set( HAS64BITS 0 ) endif(IS_64_SYSTEM) + +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.config.h.in ${CMAKE_SOURCE_DIR}/Util/UUID.config.h ) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(BOOST_COMPONENTS filesystem regex system thread) -add_library(uuid OBJECT Util/UUID.cpp) +#add_library(uuid OBJECT Util/UUID.cpp) file(GLOB ExtractorGlob Extractor/*.cpp) set(ExtractorSources extractor.cpp ${ExtractorGlob}) -add_executable(osrm-extract ${ExtractorSources} $) +add_executable(osrm-extract ${ExtractorSources} ) file(GLOB PrepareGlob Contractor/*.cpp) set(PrepareSources createHierarchy.cpp ${PrepareGlob}) -add_executable(osrm-prepare ${PrepareSources} $) +add_executable(osrm-prepare ${PrepareSources} ) -add_executable(osrm-routed routed.cpp $) +add_executable(osrm-routed routed.cpp ) set_target_properties(osrm-routed PROPERTIES COMPILE_FLAGS -DROUTED) file(GLOB DescriptorGlob Descriptors/*.cpp) @@ -85,6 +92,7 @@ include_directories(${BZIP_INCLUDE_DIRS}) target_link_libraries (osrm-extract ${BZIP2_LIBRARIES}) find_package( ZLIB REQUIRED ) +include_directories(${ZLIB_INCLUDE_DIRS}) target_link_libraries (osrm-extract ${ZLIB_LIBRARY}) target_link_libraries (osrm-routed ${ZLIB_LIBRARY}) @@ -119,6 +127,7 @@ target_link_libraries (osrm-prepare ${PROTOBUF_LIBRARY}) find_package( STXXL REQUIRED ) include_directories(${STXXL_INCLUDE_DIR}) +target_link_libraries (OSRM ${STXXL_LIBRARY}) target_link_libraries (osrm-extract ${STXXL_LIBRARY}) target_link_libraries (osrm-prepare ${STXXL_LIBRARY}) diff --git a/Util/UUID.config.h.in b/Util/UUID.config.h.in index 7e018c4ef..ac87491fc 100644 --- a/Util/UUID.config.h.in +++ b/Util/UUID.config.h.in @@ -2,5 +2,10 @@ #define UUID_CONFIG_H_ #cmakedefine01 HAS64BITS +#cmakedefine MD5PREPARE "${MD5PREPARE}" +#cmakedefine MD5RTREE "${MD5RTREE}" +#cmakedefine MD5NODEINFO "${MD5NODEINFO}" +#cmakedefine MD5GRAPH "${MD5GRAPH}" +#cmakedefine MD5OBJECTS "${MD5OBJECTS}" #endif /* UUID_CONFIG_H_ */ \ No newline at end of file diff --git a/cmake/FindLuabind.cmake b/cmake/FindLuabind.cmake index 39b325059..4b99b3c0e 100644 --- a/cmake/FindLuabind.cmake +++ b/cmake/FindLuabind.cmake @@ -27,7 +27,7 @@ FIND_PATH(LUABIND_INCLUDE_DIR luabind.hpp ) FIND_LIBRARY(LUABIND_LIBRARY - NAMES luabind + NAMES luabind luabind09 HINTS $ENV{LUABIND_DIR} PATH_SUFFIXES lib64 lib @@ -72,4 +72,4 @@ IF( NOT LUABIND_FIND_QUIETLY ) ENDIF() ENDIF() -MARK_AS_ADVANCED(LUABIND_INCLUDE_DIR LUABIND_LIBRARIES LUABIND_LIBRARY LUABIND_LIBRARY_DBG) +MARK_AS_ADVANCED(LUABIND_INCLUDE_DIR LUABIND_LIBRARIES LUABIND_LIBRARY LUABIND_LIBRARY_DBG)