(partially) sanitize capitalization
This commit is contained in:
parent
f7b72dd136
commit
cb6f4ad646
@ -90,10 +90,10 @@ if(APPLE)
|
|||||||
message(STATUS "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})
|
||||||
IF (DARWIN_VERSION GREATER 12)
|
if(DARWIN_VERSION GREATER 12)
|
||||||
MESSAGE(STATUS "Activating -std=c++11 flag for >= OS X 10.9")
|
MESSAGE(STATUS "Activating -std=c++11 flag for >= OS X 10.9")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
|
||||||
ENDIF (DARWIN_VERSION GREATER 12)
|
endif(DARWIN_VERSION GREATER 12)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(UNIX AND NOT APPLE)
|
if(UNIX AND NOT APPLE)
|
||||||
@ -109,11 +109,11 @@ if (NOT Boost_FOUND)
|
|||||||
endif(NOT Boost_FOUND)
|
endif(NOT Boost_FOUND)
|
||||||
include_directories(${Boost_INCLUDE_DIRS})
|
include_directories(${Boost_INCLUDE_DIRS})
|
||||||
|
|
||||||
IF(APPLE)
|
if(APPLE)
|
||||||
target_link_libraries( OSRM ${Boost_LIBRARIES} UUID )
|
target_link_libraries( OSRM ${Boost_LIBRARIES} UUID )
|
||||||
ELSE()
|
else()
|
||||||
target_link_libraries( OSRM ${Boost_LIBRARIES} )
|
target_link_libraries( OSRM ${Boost_LIBRARIES} )
|
||||||
ENDIF()
|
endif()
|
||||||
|
|
||||||
target_link_libraries( osrm-extract ${CoordinateGlob} ${Boost_LIBRARIES} UUID GITDESCRIPTION )
|
target_link_libraries( osrm-extract ${CoordinateGlob} ${Boost_LIBRARIES} UUID GITDESCRIPTION )
|
||||||
target_link_libraries( osrm-prepare ${CoordinateGlob} ${Boost_LIBRARIES} UUID GITDESCRIPTION )
|
target_link_libraries( osrm-prepare ${CoordinateGlob} ${Boost_LIBRARIES} UUID GITDESCRIPTION )
|
||||||
@ -133,24 +133,24 @@ find_package( Threads REQUIRED )
|
|||||||
target_link_libraries (osrm-extract ${CMAKE_THREAD_LIBS_INIT})
|
target_link_libraries (osrm-extract ${CMAKE_THREAD_LIBS_INIT})
|
||||||
|
|
||||||
find_package( Lua52 )
|
find_package( Lua52 )
|
||||||
IF ( NOT LUA52_FOUND )
|
if( NOT LUA52_FOUND )
|
||||||
find_package( Lua51 REQUIRED )
|
find_package( Lua51 REQUIRED )
|
||||||
IF (NOT APPLE)
|
if(NOT APPLE)
|
||||||
find_package( LuaJIT 5.1 )
|
find_package( LuaJIT 5.1 )
|
||||||
ENDIF ( NOT APPLE )
|
endif( NOT APPLE )
|
||||||
ELSE( NOT LUA52_FOUND )
|
else( NOT LUA52_FOUND )
|
||||||
IF(NOT APPLE)
|
if(NOT APPLE)
|
||||||
find_package( LuaJIT 5.2 )
|
find_package( LuaJIT 5.2 )
|
||||||
ENDIF(NOT APPLE)
|
endif(NOT APPLE)
|
||||||
ENDIF( NOT LUA52_FOUND )
|
endif( NOT LUA52_FOUND )
|
||||||
|
|
||||||
IF ( LUAJIT_FOUND )
|
if( LUAJIT_FOUND )
|
||||||
target_link_libraries( osrm-extract ${LUAJIT_LIBRARIES} )
|
target_link_libraries( osrm-extract ${LUAJIT_LIBRARIES} )
|
||||||
target_link_libraries( osrm-prepare ${LUAJIT_LIBRARIES} )
|
target_link_libraries( osrm-prepare ${LUAJIT_LIBRARIES} )
|
||||||
ELSE ()
|
else()
|
||||||
target_link_libraries( osrm-extract ${LUA_LIBRARY} )
|
target_link_libraries( osrm-extract ${LUA_LIBRARY} )
|
||||||
target_link_libraries( osrm-prepare ${LUA_LIBRARY} )
|
target_link_libraries( osrm-prepare ${LUA_LIBRARY} )
|
||||||
ENDIF ()
|
endif()
|
||||||
include_directories(${LUA_INCLUDE_DIR})
|
include_directories(${LUA_INCLUDE_DIR})
|
||||||
|
|
||||||
find_package( LibXml2 REQUIRED )
|
find_package( LibXml2 REQUIRED )
|
||||||
|
Loading…
Reference in New Issue
Block a user