Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2016-11-29 09:01:38 +0300
committerMike Erwin <significant.bit@gmail.com>2016-11-29 09:01:38 +0300
commita76f1a744938661c90c9c1f7fd11ae1177b5c67e (patch)
tree9ff269155a0797ed0043c1ca6f0987167e719dac /CMakeLists.txt
parent8d4421b0fccd768e66e912e216e71661bb539445 (diff)
Default to C++11 for all compilers (2.8)
This fixes multiple problems on latest Mac OS + Xcode. Hopefully does not cause any on other platforms. The Xcode detection logic could use further cleanup. It's checking several old versions that are unsupported for Blender 2.8+ development.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index afc1d9d5872..f547b0bdf70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -497,11 +497,10 @@ endif()
# 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))
set(_c11_init ON)
- set(_cxx11_init ON)
else()
set(_c11_init OFF)
- set(_cxx11_init OFF)
endif()
+set(_cxx11_init ON)
option(WITH_C11 "Build with C11 standard enabled, for development use only!" ${_c11_init})
mark_as_advanced(WITH_C11)