From e01561185df8d56f3978ed4fdfcf2b240c06da11 Mon Sep 17 00:00:00 2001
From: Clement <clement.brisset@gmail.com>
Date: Fri, 19 Apr 2019 20:15:56 -0700
Subject: [PATCH] Dependencies have correct osx deploy target
---
CMakeLists.txt | 9 ++++++++-
cmake/compiler.cmake | 4 +---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 551cfd2636..49994d27b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,14 @@ endif()
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros/TargetPython.cmake")
target_python()
-if (HIFI_ANDROID )
+# set our OS X deployment target
+# (needs to be set before first project() call and before prebuild.py)
+# Will affect VCPKG dependencies
+if (APPLE)
+ set(ENV{MACOSX_DEPLOYMENT_TARGET} 10.9)
+endif()
+
+if (HIFI_ANDROID)
execute_process(
COMMAND ${HIFI_PYTHON_EXEC} ${CMAKE_CURRENT_SOURCE_DIR}/prebuild.py --android ${HIFI_ANDROID_APP} --build-root ${CMAKE_BINARY_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index bc35d2f2f8..bfdc851905 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -88,12 +88,10 @@ if (APPLE)
exec_program(sw_vers ARGS -productVersion OUTPUT_VARIABLE OSX_VERSION)
string(REGEX MATCH "^[0-9]+\\.[0-9]+" OSX_VERSION ${OSX_VERSION})
message(STATUS "Detected OS X version = ${OSX_VERSION}")
+ message(STATUS "OS X deployment target = ${CMAKE_OSX_DEPLOYMENT_TARGET}")
set(OSX_SDK "${OSX_VERSION}" CACHE String "OS X SDK version to look for inside Xcode bundle or at OSX_SDK_PATH")
- # set our OS X deployment target
- set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
-
# find the SDK path for the desired SDK
find_path(
_OSX_DESIRED_SDK_PATH