(partially) sanitize capitalization
This commit is contained in:
parent
f7b72dd136
commit
cb6f4ad646
@ -70,17 +70,17 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
|
||||
endif(CMAKE_BUILD_TYPE MATCHES Release)
|
||||
|
||||
# Configuring compilers
|
||||
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
# using Clang
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas -Wno-unneeded-internal-declaration -pedantic -fPIC")
|
||||
message(STATUS "OpenMP parallelization not available using clang++")
|
||||
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||
# using GCC
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fopenmp -pedantic -fPIC")
|
||||
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
|
||||
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
|
||||
# using Intel C++
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-intel -wd10237 -Wall -openmp -ipo -fPIC")
|
||||
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
|
||||
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
|
||||
# using Visual Studio C++
|
||||
endif()
|
||||
|
||||
@ -90,10 +90,10 @@ if(APPLE)
|
||||
message(STATUS "Set Architecture to x64 on OS X")
|
||||
EXEC_PROGRAM(uname ARGS -v OUTPUT_VARIABLE 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")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
|
||||
ENDIF (DARWIN_VERSION GREATER 12)
|
||||
endif(DARWIN_VERSION GREATER 12)
|
||||
endif()
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
@ -104,16 +104,16 @@ endif(UNIX AND NOT APPLE)
|
||||
#Check Boost
|
||||
set(BOOST_MIN_VERSION "1.46.0")
|
||||
find_package( Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_COMPONENTS} REQUIRED )
|
||||
if (NOT Boost_FOUND)
|
||||
if(NOT Boost_FOUND)
|
||||
message(FATAL_ERROR "Fatal error: Boost (version >= 1.46.0) required.\n")
|
||||
endif (NOT Boost_FOUND)
|
||||
endif(NOT Boost_FOUND)
|
||||
include_directories(${Boost_INCLUDE_DIRS})
|
||||
|
||||
IF(APPLE)
|
||||
if(APPLE)
|
||||
target_link_libraries( OSRM ${Boost_LIBRARIES} UUID )
|
||||
ELSE()
|
||||
else()
|
||||
target_link_libraries( OSRM ${Boost_LIBRARIES} )
|
||||
ENDIF()
|
||||
endif()
|
||||
|
||||
target_link_libraries( osrm-extract ${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})
|
||||
|
||||
find_package( Lua52 )
|
||||
IF ( NOT LUA52_FOUND )
|
||||
if( NOT LUA52_FOUND )
|
||||
find_package( Lua51 REQUIRED )
|
||||
IF (NOT APPLE)
|
||||
if(NOT APPLE)
|
||||
find_package( LuaJIT 5.1 )
|
||||
ENDIF ( NOT APPLE )
|
||||
ELSE( NOT LUA52_FOUND )
|
||||
IF(NOT APPLE)
|
||||
endif( NOT APPLE )
|
||||
else( NOT LUA52_FOUND )
|
||||
if(NOT APPLE)
|
||||
find_package( LuaJIT 5.2 )
|
||||
ENDIF(NOT APPLE)
|
||||
ENDIF( NOT LUA52_FOUND )
|
||||
endif(NOT APPLE)
|
||||
endif( NOT LUA52_FOUND )
|
||||
|
||||
IF ( LUAJIT_FOUND )
|
||||
if( LUAJIT_FOUND )
|
||||
target_link_libraries( osrm-extract ${LUAJIT_LIBRARIES} )
|
||||
target_link_libraries( osrm-prepare ${LUAJIT_LIBRARIES} )
|
||||
ELSE ()
|
||||
else()
|
||||
target_link_libraries( osrm-extract ${LUA_LIBRARY} )
|
||||
target_link_libraries( osrm-prepare ${LUA_LIBRARY} )
|
||||
ENDIF ()
|
||||
endif()
|
||||
include_directories(${LUA_INCLUDE_DIR})
|
||||
|
||||
find_package( LibXml2 REQUIRED )
|
||||
|
Loading…
Reference in New Issue
Block a user