aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWohlstand <admin@wohlnet.ru>2020-10-14 10:52:16 +0300
committerWohlstand <admin@wohlnet.ru>2020-10-14 10:52:16 +0300
commite30379bdd5aa17b0d60dc7071ddc8d2e155c6467 (patch)
tree5ea2c0febcf4b67c8c928a58008de759eb2ded0f
parent72f68a25c9825fe48750376c56d2fdc6d014fddc (diff)
downloadlibADLMIDI-e30379bdd5aa17b0d60dc7071ddc8d2e155c6467.tar.gz
libADLMIDI-e30379bdd5aa17b0d60dc7071ddc8d2e155c6467.tar.bz2
libADLMIDI-e30379bdd5aa17b0d60dc7071ddc8d2e155c6467.zip
GenAdlData: Small fix for OpenMP detect on MSVC
Thanks to Altazimuth for an explanation for the possible issues met at MSVC when building and running the GenAdldata on it.
-rw-r--r--utils/gen_adldata/CMakeLists.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/utils/gen_adldata/CMakeLists.txt b/utils/gen_adldata/CMakeLists.txt
index 22992d0..aa7ff00 100644
--- a/utils/gen_adldata/CMakeLists.txt
+++ b/utils/gen_adldata/CMakeLists.txt
@@ -5,8 +5,13 @@ 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}")
+ if(MSVC AND NOT (MSVC_VERSION LESS 1900))
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -openmp:experimental")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -openmp:experimental")
+ else()
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+ endif()
endif()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})