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:
authorArto Kitula <arto.kitula@gmail.com>2017-09-21 23:54:17 +0300
committerArto Kitula <arto.kitula@gmail.com>2017-09-21 23:54:17 +0300
commitb3b3c6d8aed3df0dd06c7ff6b1b24446d0e62b0d (patch)
tree74af6b5b743601e54c8575d971a83a05d4c1bf2d /build_files/build_environment/cmake/options.cmake
parent07ec0effb61e18a3d2f1bad97ebf7f6cb5bb6b87 (diff)
build deps: add support for multiple xcode installs
Diffstat (limited to 'build_files/build_environment/cmake/options.cmake')
-rw-r--r--build_files/build_environment/cmake/options.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index 6dbf3f46b1a..78d6a11795f 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -115,10 +115,14 @@ else()
set(LIBPREFIX "lib")
if(APPLE)
+# Let's get the current Xcode dir, to support xcode-select
+ execute_process(
+ COMMAND xcode-select --print-path
+ OUTPUT_VARIABLE XCODE_DEV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
set(OSX_ARCHITECTURES x86_64)
set(OSX_DEPLOYMENT_TARGET 10.9)
set(OSX_SDK_VERSION 10.12)
- set(OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.sdk)
+ set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.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++")