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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2017-09-28 21:52:22 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-09-28 21:53:06 +0300
commitc10ac1bb5c9d0e3bffa97cb5499680c6f1b682b7 (patch)
tree901fb84c770be8072138fc105a9113c2412371d1 /CMakeLists.txt
parent2a36ee16c105f45cf57d25acc8ad4c1e737b3724 (diff)
macOS: officially upgrade to 10.9 libraries from lib/darwin.
This removes a bunch of code that is no longer needed, and running "make update" will now automatically download the new libraries. Differential Revision: https://developer.blender.org/D2861
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f43049731b..1bb514b14b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -500,7 +500,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)
set(_cxx11_init ON)
else()