From 043ba92381e3572fb6d58112b7bc31d6fd21fdd2 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Tue, 8 May 2018 13:14:25 +0300 Subject: CMake: Use different strategy to identify MinGW if CMAKE_CXX_COMPILER_ID doesn't gives "GNU" --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index bda3e0b..dce3bd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,9 +141,10 @@ if(WITH_EMBEDDED_BANKS) endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR - "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") + "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" OR + CMAKE_COMPILER_IS_MINGW) if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.2) - message("Turned on C++11 on GCC/CLang/Intel") + message("Turned on C++11 on GCC/CLang/Intel/MinGW") target_compile_options(gen_adldata PUBLIC $<$:-std=c++11>) endif() else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") -- cgit v1.2.3 From 61991cfd68afd7531b3d865c7870b10fc4a43de6 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Tue, 8 May 2018 13:19:57 +0300 Subject: CMake: Another attempt to fix MinGW build --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index dce3bd3..f175476 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,9 +139,10 @@ if(WITH_EMBEDDED_BANKS) 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 + 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} GREATER 3.2) message("Turned on C++11 on GCC/CLang/Intel/MinGW") -- cgit v1.2.3 From 25b65876d06ad252e0237a6c884d51d97a91da64 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Tue, 8 May 2018 13:24:21 +0300 Subject: CMake: third attempt to fix MinGW build --- CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') 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 $<$:-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 $<$:-std=c++11>) endif() -- cgit v1.2.3 From 788c3f5211b0eb98d2bdcd6bfab1393dc551cda6 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Tue, 8 May 2018 13:31:16 +0300 Subject: CMake: Fourth attempt to fix MinGW build --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a57b98..d6dbd01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,7 +146,9 @@ if(WITH_EMBEDDED_BANKS) CMAKE_COMPILER_IS_MINGW) 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 $<$:-std=c++11>) + set_target_properties(gen_adldata PROPERTIES + CXX_STANDARD 11 + CXX_STANDARD_REQUIRED YES) endif() else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") message("Turned on C++11 on MSVC") @@ -382,7 +384,9 @@ if(WITH_ADLMIDI2) 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 $<$:-std=c++11>) + set_target_properties(gen_adldata PROPERTIES + CXX_STANDARD 11 + CXX_STANDARD_REQUIRED YES) endif() else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") message("Turned on C++11 on MSVC") -- cgit v1.2.3