diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e92890c4..e51863f33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ if(NOT(CMAKE_BUILD_TYPE)) set(CMAKE_BUILD_TYPE Release) endif() -if(CMAKE_VERSION VERSION_LESS 3.1) +if(CMAKE_VERSION VERSION_LESS 3.1 OR TARGET_OS STREQUAL "mac") if(CMAKE_CXX_COMPILER_ID MATCHES Clang OR CMAKE_CXX_COMPILER_ID MATCHES GNU) if(CMAKE_CXX_FLAGS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") @@ -1457,8 +1457,9 @@ foreach(target ${TARGETS_LINK}) endforeach() foreach(target ${TARGETS_OWN}) - if(CMAKE_VERSION VERSION_GREATER 3.1 OR CMAKE_VERSION VERSION_EQUAL 3.1) + if((CMAKE_VERSION VERSION_GREATER 3.1 OR CMAKE_VERSION VERSION_EQUAL 3.1) AND NOT TARGET_OS STREQUAL "mac") set_property(TARGET ${target} PROPERTY CXX_STANDARD 11) + set_property(TARGET ${target} PROPERTY CXX_STANDARD_REQUIRED ON) endif() if(MSVC)