fix checking for successful compilation of stxxl with OpenMP

This commit is contained in:
Dennis Luxen 2015-01-29 12:41:38 +01:00
parent 8b2ca6b13d
commit d241aef502

View File

@ -10,15 +10,15 @@ CHECK_CXX_SOURCE_COMPILES("${STXXL_CHECK_SRC}" STXXL_WORKS)
if(STXXL_WORKS) if(STXXL_WORKS)
message(STATUS "STXXL can be used without linking against libgomp") message(STATUS "STXXL can be used without linking against libgomp")
else() else()
unset(STXXL_WORKS) message(STATUS "Linking STXXL failed without libgomp, retrying ..")
message(STATUS "STXXL failed without libgomp, retrying ..") find_package(OpenMP)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} -lgomp) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${OpenMP_CXX_FLAGS}")
CHECK_CXX_SOURCE_COMPILES("${STXXL_CHECK_SRC}" STXXL_LINKS)
CHECK_CXX_SOURCE_COMPILES("${STXXL_CHECK_SRC}" STXXL_WORKS) if (STXXL_LINKS)
message(STATUS "STXXL needs to link against OpenMP")
if (STXXL_WORKS)
target_link_libraries(osrm-extract gomp) target_link_libraries(osrm-extract gomp)
else() else()
message(FATAL "STXXL failed failed, libgomp missing?") message(FATAL_ERROR "STXXL failed failed, libgomp missing?")
endif() endif()
endif() endif()