From 10603bc5db691f0763891bb255cc23a95818cec5 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:38:27 +0100 Subject: Fix OpenMP handling --- utils/gen_adldata/CMakeLists.txt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'utils/gen_adldata/CMakeLists.txt') diff --git a/utils/gen_adldata/CMakeLists.txt b/utils/gen_adldata/CMakeLists.txt index ef1339b..40aa4b5 100644 --- a/utils/gen_adldata/CMakeLists.txt +++ b/utils/gen_adldata/CMakeLists.txt @@ -4,6 +4,10 @@ project(gen_adldata CXX) set(CMAKE_CXX_STANDARD 11) find_package(OpenMP) +if(OPENMP_FOUND) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") +endif() set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) @@ -40,17 +44,11 @@ endif() add_executable(gen_adldata ${GEN_ADLDATA_SRC} ) -if(NOT MSVC) - target_link_libraries(gen_adldata PRIVATE pthread m stdc++) -endif() -if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|Intel|MinGW" OR MINGW) - if(OPENMP_FOUND) - target_compile_options(gen_adldata PUBLIC "-fopenmp") - target_link_libraries(gen_adldata PRIVATE "-fopenmp") - endif() -else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +if(MSVC) message("Turned on C++11 on MSVC") target_compile_options(gen_adldata PUBLIC "/std:c++latest") +else() + target_link_libraries(gen_adldata PRIVATE pthread m stdc++) endif() if(WITH_GENADLDATA_COMMENTS) -- cgit v1.2.3