aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Novichkov <Wohlstand@users.noreply.github.com>2018-05-08 13:31:16 +0300
committerGitHub <noreply@github.com>2018-05-08 13:31:16 +0300
commit788c3f5211b0eb98d2bdcd6bfab1393dc551cda6 (patch)
treed2439ebe8f073e1f4f05710037592c684224a4ea
parent25b65876d06ad252e0237a6c884d51d97a91da64 (diff)
downloadlibADLMIDI-788c3f5211b0eb98d2bdcd6bfab1393dc551cda6.tar.gz
libADLMIDI-788c3f5211b0eb98d2bdcd6bfab1393dc551cda6.tar.bz2
libADLMIDI-788c3f5211b0eb98d2bdcd6bfab1393dc551cda6.zip
CMake: Fourth attempt to fix MinGW build
-rw-r--r--CMakeLists.txt8
1 files changed, 6 insertions, 2 deletions
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 $<$<COMPILE_LANGUAGE:CXX>:-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 $<$<COMPILE_LANGUAGE:CXX>:-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")