diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-29 12:55:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-29 12:55:00 +0300 |
| commit | e3fe8128e41bb7c576f02ba234dfabf5c399cb60 (patch) | |
| tree | cd148a38fb32cdb1a36fc576b9f36fe864003e40 /CMakeLists.txt | |
| parent | 31be6fccf83095f4245f97730ccc7e61e51cfcec (diff) | |
| parent | 5a1954a5cbd7b0b1458fdc80ada5acd036278309 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f920474f09..12f546dd158 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -494,7 +494,12 @@ endif() # Experimental support of C11 and C++11 # # We default options to whatever default standard in the current compiler. -if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "6.0") AND (NOT WITH_CXX11)) +if(APPLE) + set(_c11_init ON) + set(_cxx11_init ON) + set(WITH_C11 ON) + set(WITH_CXX11 ON) +elseif(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "6.0") AND (NOT WITH_CXX11)) set(_c11_init ON) else() set(_c11_init OFF) |