Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix status messages during configure

Browse Source
This commit is contained in:
Dennis Luxen 2013-10-16 11:58:29 +02:00
parent dced47024f
commit 175112d97d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -36,9 +36,9 @@ file(GLOB ExtractorGlob Extractor/*.cpp)
set(ExtractorSources extractor.cpp ${ExtractorGlob}) set(ExtractorSources extractor.cpp ${ExtractorGlob})
add_executable(osrm-extract ${ExtractorSources} ) add_executable(osrm-extract ${ExtractorSources} )
file(GLOB PrepareGlob Contractor/*.cpp) file( GLOB PrepareGlob Contractor/*.cpp)
set(PrepareSources prepare.cpp ${PrepareGlob} ) set( PrepareSources prepare.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) set_target_properties(osrm-routed PROPERTIES COMPILE_FLAGS -DROUTED)
@ -86,11 +86,11 @@ endif()
if(APPLE) if(APPLE)
SET(CMAKE_OSX_ARCHITECTURES "x86_64") SET(CMAKE_OSX_ARCHITECTURES "x86_64")
message("Set Architecture to x64 on OS X") message(STATUS "Set Architecture to x64 on OS X")
EXEC_PROGRAM(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION) EXEC_PROGRAM(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION)
STRING(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) STRING(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
MESSAGE(STATUS "DARWIN_VERSION=${DARWIN_VERSION}")
IF (DARWIN_VERSION GREATER 12) IF (DARWIN_VERSION GREATER 12)
MESSAGE(STATUS "Activating flags for OS X 10.9")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
ENDIF (DARWIN_VERSION GREATER 12) ENDIF (DARWIN_VERSION GREATER 12)
endif() endif()
@ -163,7 +163,7 @@ target_link_libraries (osrm-extract ${OSMPBF_LIBRARY})
target_link_libraries (osrm-prepare ${OSMPBF_LIBRARY}) target_link_libraries (osrm-prepare ${OSMPBF_LIBRARY})
if(WITH_TOOLS) if(WITH_TOOLS)
message("-- Activating OSRM internal tools") message(STATUS "Activating OSRM internal tools")
find_package( GDAL ) find_package( GDAL )
if(GDAL_FOUND) if(GDAL_FOUND)
add_executable(osrm-components Tools/componentAnalysis.cpp) add_executable(osrm-components Tools/componentAnalysis.cpp)