From d241aef502b240d9b47345560bd2f1c7124cb770 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Thu, 29 Jan 2015 12:41:38 +0100 Subject: [PATCH] fix checking for successful compilation of stxxl with OpenMP --- cmake/check_stxxl.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/check_stxxl.cmake b/cmake/check_stxxl.cmake index 0b437f3a3..7f399f096 100644 --- a/cmake/check_stxxl.cmake +++ b/cmake/check_stxxl.cmake @@ -10,15 +10,15 @@ CHECK_CXX_SOURCE_COMPILES("${STXXL_CHECK_SRC}" STXXL_WORKS) if(STXXL_WORKS) message(STATUS "STXXL can be used without linking against libgomp") else() - unset(STXXL_WORKS) - message(STATUS "STXXL failed without libgomp, retrying ..") - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} -lgomp) + message(STATUS "Linking STXXL failed without libgomp, retrying ..") + find_package(OpenMP) + 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_WORKS) + if (STXXL_LINKS) + message(STATUS "STXXL needs to link against OpenMP") target_link_libraries(osrm-extract gomp) else() - message(FATAL "STXXL failed failed, libgomp missing?") + message(FATAL_ERROR "STXXL failed failed, libgomp missing?") endif() endif()