From ba12e312805969251b79d8d85db3e87114201a72 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 4 Nov 2013 14:37:25 -0800 Subject: [PATCH] osx build: only set -std=c++11 flag for >= 10.9 --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3637e754..ecf026b5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,9 +70,6 @@ endif(CMAKE_BUILD_TYPE MATCHES Release) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") # using Clang set(CMAKE_CXX_FLAGS "-Wall -Wno-unknown-pragmas -Wno-unneeded-internal-declaration") - if(APPLE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif(APPLE) message(STATUS "OpenMP parallelization not available using clang++") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # using GCC @@ -91,7 +88,7 @@ if(APPLE) EXEC_PROGRAM(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION) STRING(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) IF (DARWIN_VERSION GREATER 12) - MESSAGE(STATUS "Activating flags for OS X 10.9") + MESSAGE(STATUS "Activating -std=c++11 flag for >= OS X 10.9") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") ENDIF (DARWIN_VERSION GREATER 12) endif()