diff options
| author | Wohlstand <admin@wohlnet.ru> | 2017-10-23 22:25:15 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2017-10-23 22:25:15 +0300 |
| commit | 5e566534205655c89d6c9256e4419c7502339a49 (patch) | |
| tree | 51861634556de481478cdcaf94c1b649105df6b0 /CMakeLists.txt | |
| parent | a8dde37099558dc805dfa07eb870c2baf66f4fec (diff) | |
| parent | 9de1ad18d5305f21cb6998bdd88144893d0e121d (diff) | |
| download | libADLMIDI-5e566534205655c89d6c9256e4419c7502339a49.tar.gz libADLMIDI-5e566534205655c89d6c9256e4419c7502339a49.tar.bz2 libADLMIDI-5e566534205655c89d6c9256e4419c7502339a49.zip | |
Merge branch 'master' of github.com:Wohlstand/libADLMIDI
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4728a30..4d9c39b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,9 @@ option(USE_DOSBOX_EMULATOR "Use DosBox emulator" OFF) option(libADLMIDI_STATIC "Build static library of libADLMIDI" ON) option(libADLMIDI_SHARED "Build shared library of libADLMIDI" OFF) - +if(CMAKE_VERSION VERSION_EQUAL "3.1" OR CMAKE_VERSION VERSION_GREATER "3.1") + set(CMAKE_CXX_STANDARD 11) +endif() set(libADLMIDI_INSTALLS) @@ -77,14 +79,19 @@ if(WITH_EMBEDDED_BANKS) if(NOT MSVC) target_link_libraries(gen_adldata pthread) endif() - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - message("Turned on C++11 on GCC") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR + CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR + "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") + message("Turned on C++11 on GCC/CLang/Intel") target_compile_options(gen_adldata PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>) + else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + message("Turned on C++11 on MSVC") + target_compile_options(gen_adldata PUBLIC "/std:c++latest") endif() add_custom_target( gen-adldata-run - COMMAND ${libADLMIDI_BINARY_DIR}/gen_adldata ${libADLMIDI_SOURCE_DIR}/src/adldata.cpp + COMMAND gen_adldata ${libADLMIDI_SOURCE_DIR}/src/adldata.cpp WORKING_DIRECTORY ${libADLMIDI_SOURCE_DIR} ) add_dependencies(gen-adldata-run gen_adldata) |