diff options
| author | Alexander Grund <alexander.grund@tu-dresden.de> | 2018-12-13 10:38:27 +0100 |
|---|---|---|
| committer | Alexander Grund <alexander.grund@tu-dresden.de> | 2018-12-13 10:42:21 +0100 |
| commit | 10603bc5db691f0763891bb255cc23a95818cec5 (patch) | |
| tree | b9e48346b441dd29b9116d49cdefb708bc45e9ed | |
| parent | 2fd13442097f92350ee481361f73015c918d91b5 (diff) | |
| download | libADLMIDI-10603bc5db691f0763891bb255cc23a95818cec5.tar.gz libADLMIDI-10603bc5db691f0763891bb255cc23a95818cec5.tar.bz2 libADLMIDI-10603bc5db691f0763891bb255cc23a95818cec5.zip | |
Fix OpenMP handling
| -rw-r--r-- | utils/adlmidi-2/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | utils/gen_adldata/CMakeLists.txt | 16 |
2 files changed, 12 insertions, 15 deletions
diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index e9c1f7d..6907b15 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -4,6 +4,10 @@ project(adlmidi2 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}) @@ -59,12 +63,7 @@ if(NOT WITH_CPP_EXTRAS) message(FATAL_ERROR "ADLMIDI2 Requires C++ Extras. Please enable WITH_CPP_EXTRAS option!") endif() -if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|Intel|MinGW" OR MINGW) - if(OPENMP_FOUND) - target_compile_options(adlmidi2 PUBLIC "-fopenmp") - target_link_libraries(adlmidi2 PRIVATE "-fopenmp") - endif() -else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +if(MSVC) message("Turned on C++11 on MSVC") target_compile_options(adlmidi2 PUBLIC "/std:c++latest") endif() 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) |