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:
authorStefan Werner <stefan.werner@tangent-animation.com>2019-03-01 12:01:55 +0300
committerStefan Werner <stefan.werner@tangent-animation.com>2019-03-01 12:01:55 +0300
commit1915b5338b4de372733b7a960f563283fb9f391e (patch)
treea5e66a747e6e0e218e1f6735594a0f803b79df00 /build_files/build_environment/cmake/options.cmake
parent90526e1606c337440a1846c968276a24945ae853 (diff)
build_environment: Fixed `make deps` on macOS
Two changes: Removed the explicit version for the macOS SDK, recent versions of Xcode have a symlink to the newest SDK. Fixed the build script for OpenMP by removing extra ' marks that install_name_tool took literally and replaced INSTALL_PATH with INSTALL_DIR.
Diffstat (limited to 'build_files/build_environment/cmake/options.cmake')
-rw-r--r--build_files/build_environment/cmake/options.cmake3
1 files changed, 1 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index 20e9750bed6..ac36c891976 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -127,8 +127,7 @@ else()
)
set(OSX_ARCHITECTURES x86_64)
set(OSX_DEPLOYMENT_TARGET 10.9)
- set(OSX_SDK_VERSION 10.13)
- set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.sdk)
+ set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++")