diff options
author | Vitaly Novichkov <Wohlstand@users.noreply.github.com> | 2018-12-14 02:05:39 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-14 02:05:39 +0300 |
commit | 2ecbf2805699c218286321d2d2bf41dbe09113f1 (patch) | |
tree | b9e48346b441dd29b9116d49cdefb708bc45e9ed /utils/gen_adldata | |
parent | c43c8b1293f1766abfef5689c8d21fb0fd124f6f (diff) | |
parent | 10603bc5db691f0763891bb255cc23a95818cec5 (diff) | |
download | libADLMIDI-2ecbf2805699c218286321d2d2bf41dbe09113f1.tar.gz libADLMIDI-2ecbf2805699c218286321d2d2bf41dbe09113f1.tar.bz2 libADLMIDI-2ecbf2805699c218286321d2d2bf41dbe09113f1.zip |
Merge pull request #197 from Flamefire/CMake
Improve CMake
Diffstat (limited to 'utils/gen_adldata')
-rw-r--r-- | utils/gen_adldata/CMakeLists.txt | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/utils/gen_adldata/CMakeLists.txt b/utils/gen_adldata/CMakeLists.txt index 766b9b7..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,21 +44,11 @@ endif() add_executable(gen_adldata ${GEN_ADLDATA_SRC} ) -if(NOT MSVC) - target_link_libraries(gen_adldata pthread m stdc++) -endif() -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR - "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR - "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" OR - "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MinGW" OR - CMAKE_COMPILER_IS_MINGW) - if(OPENMP_FOUND) - target_compile_options(gen_adldata PUBLIC "-fopenmp") - target_link_libraries(gen_adldata "-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) @@ -71,4 +65,3 @@ add_custom_target(gen-adldata-run #OUTPUT ${ADLDATA_DATABASE} COMMENT "Running Embedded FM banks database generation" VERBATIM ) - |