From 74b4ee66e3b5775f41526d76e7a16433b52f2627 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Sun, 22 Oct 2017 02:30:34 +0300 Subject: Fixed CMake build on macOS --- CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 4728a30..d22212d 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,9 +79,14 @@ 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 $<$:-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( -- cgit v1.2.3