diff options
| author | Vitaly Novichkov <Wohlstand@users.noreply.github.com> | 2018-05-08 13:24:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-08 13:24:21 +0300 |
| commit | 25b65876d06ad252e0237a6c884d51d97a91da64 (patch) | |
| tree | 30c9617f874e9e463c8ff8a810e3360ee201cb0c | |
| parent | 61991cfd68afd7531b3d865c7870b10fc4a43de6 (diff) | |
| download | libADLMIDI-25b65876d06ad252e0237a6c884d51d97a91da64.tar.gz libADLMIDI-25b65876d06ad252e0237a6c884d51d97a91da64.tar.bz2 libADLMIDI-25b65876d06ad252e0237a6c884d51d97a91da64.zip | |
CMake: third attempt to fix MinGW build
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f175476..6a57b98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,7 +144,7 @@ if(WITH_EMBEDDED_BANKS) "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MinGW" OR CMAKE_COMPILER_IS_MINGW) - if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.2) + if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.2) message("Turned on C++11 on GCC/CLang/Intel/MinGW") target_compile_options(gen_adldata PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>) endif() @@ -375,10 +375,12 @@ if(WITH_ADLMIDI2) message(FATAL_ERROR "ADLMIDI2 Requires C++ Extras. Please enable WITH_CPP_EXTRAS option!") endif() - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR - CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR - "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") - if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.2) + 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(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.2) message("Turned on C++11 on GCC/CLang/Intel") target_compile_options(adlmidi2 PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>) endif() |