remove OpenMP library linking
This commit is contained in:
parent
48da2d2dfb
commit
a09f97c9d5
@ -118,7 +118,6 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
|||||||
add_definitions(-DM_PI=3.141592653589793238462643383) # define M_PI
|
add_definitions(-DM_PI=3.141592653589793238462643383) # define M_PI
|
||||||
add_definitions(-DWIN32)
|
add_definitions(-DWIN32)
|
||||||
SET(OPTIONAL_SOCKET_LIBS ws2_32 wsock32)
|
SET(OPTIONAL_SOCKET_LIBS ws2_32 wsock32)
|
||||||
SET(OPTIONAL_OMP_LIB gomp)
|
|
||||||
endif()
|
endif()
|
||||||
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
|
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
|
||||||
# using Intel C++
|
# using Intel C++
|
||||||
@ -185,7 +184,7 @@ target_link_libraries(osrm-routed ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSR
|
|||||||
target_link_libraries(osrm-datastore ${Boost_LIBRARIES} FINGERPRINT GITDESCRIPTION COORDLIB)
|
target_link_libraries(osrm-datastore ${Boost_LIBRARIES} FINGERPRINT GITDESCRIPTION COORDLIB)
|
||||||
|
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
target_link_libraries(osrm-extract ${CMAKE_THREAD_LIBS_INIT} ${OPTIONAL_OMP_LIB})
|
target_link_libraries(osrm-extract ${CMAKE_THREAD_LIBS_INIT})
|
||||||
target_link_libraries(osrm-datastore ${CMAKE_THREAD_LIBS_INIT})
|
target_link_libraries(osrm-datastore ${CMAKE_THREAD_LIBS_INIT})
|
||||||
target_link_libraries(OSRM ${CMAKE_THREAD_LIBS_INIT})
|
target_link_libraries(OSRM ${CMAKE_THREAD_LIBS_INIT})
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user