diff options
| author | Wohlstand <admin@wohlnet.ru> | 2017-10-31 03:42:37 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2017-10-31 03:42:37 +0300 |
| commit | 634fefa614f29056e5b4dadc1e4db9ce61d49e59 (patch) | |
| tree | 1dfd49be726113898395449ae337308f138e43aa /CMakeLists.txt | |
| parent | 78b48a4f7250f94b62a5c995f8c714804bb66eef (diff) | |
| parent | 24f30e137009fda5262c6465742fb997a1ef8e8f (diff) | |
| download | libADLMIDI-634fefa614f29056e5b4dadc1e4db9ce61d49e59.tar.gz libADLMIDI-634fefa614f29056e5b4dadc1e4db9ce61d49e59.tar.bz2 libADLMIDI-634fefa614f29056e5b4dadc1e4db9ce61d49e59.zip | |
Merge branch 'master' into seekability
# Conflicts:
# libADLMIDI-test.pro
# src/adlmidi.cpp
# src/adlmidi_private.hpp
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) |