From e624b0ce8eb53fc7633d423a604277b9b61d66af Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 20 Sep 2018 17:00:11 -0700
Subject: [PATCH 1/2] bump deployment target to 10.9 so libc++ is default
---
cmake/compiler.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index 6ff6fce1d8..e68b2ec9b0 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -88,7 +88,7 @@ if (APPLE)
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.8)
+ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
# find the SDK path for the desired SDK
find_path(
From eb7b7440bf15ba40b5c65b52b5d863229afa21f8 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 20 Sep 2018 17:12:30 -0700
Subject: [PATCH 2/2] changes for cmake 3.12 and MacOS 10.14
---
cmake/externals/quazip/CMakeLists.txt | 14 +++++++-------
cmake/init.cmake | 6 +++---
cmake/macros/TargetZlib.cmake | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/cmake/externals/quazip/CMakeLists.txt b/cmake/externals/quazip/CMakeLists.txt
index 6960f7682a..7a13720f35 100644
--- a/cmake/externals/quazip/CMakeLists.txt
+++ b/cmake/externals/quazip/CMakeLists.txt
@@ -1,14 +1,12 @@
set(EXTERNAL_NAME quazip)
string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-cmake_policy(SET CMP0046 OLD)
include(ExternalProject)
set(QUAZIP_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${QT_CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib -DZLIB_ROOT=${ZLIB_ROOT} -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
-if (APPLE)
-else ()
- set(QUAZIP_CMAKE_ARGS ${QUAZIP_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=11)
+if (NOT APPLE)
+ set(QUAZIP_CMAKE_ARGS ${QUAZIP_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=11)
endif ()
ExternalProject_Add(
@@ -22,10 +20,12 @@ ExternalProject_Add(
LOG_BUILD 1
)
-add_dependencies(quazip zlib)
+if (WIN32)
+ add_dependencies(quazip zlib)
+endif ()
# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES
+set_target_properties(${EXTERNAL_NAME} PROPERTIES
FOLDER "hidden/externals"
INSTALL_NAME_DIR ${INSTALL_DIR}/lib
BUILD_WITH_INSTALL_RPATH True)
@@ -54,4 +54,4 @@ select_library_configurations(${EXTERNAL_NAME_UPPER})
# Force selected libraries into the cache
set(${EXTERNAL_NAME_UPPER}_LIBRARY ${${EXTERNAL_NAME_UPPER}_LIBRARY} CACHE FILEPATH "Location of QuaZip libraries")
-set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARIES} CACHE FILEPATH "Location of QuaZip libraries")
+set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARIES} CACHE FILEPATH "Location of QuaZip libraries")
diff --git a/cmake/init.cmake b/cmake/init.cmake
index 9d7b0fd94c..9adcb167df 100644
--- a/cmake/init.cmake
+++ b/cmake/init.cmake
@@ -3,11 +3,11 @@ if (WIN32)
endif (WIN32)
if (POLICY CMP0043)
- cmake_policy(SET CMP0043 OLD)
+ cmake_policy(SET CMP0043 NEW)
endif ()
if (POLICY CMP0042)
- cmake_policy(SET CMP0042 OLD)
+ cmake_policy(SET CMP0042 NEW)
endif ()
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -34,7 +34,7 @@ file(GLOB HIFI_CUSTOM_MACROS "cmake/macros/*.cmake")
foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})
include(${CUSTOM_MACRO})
endforeach()
-unset(HIFI_CUSTOM_MACROS)
+unset(HIFI_CUSTOM_MACROS)
if (ANDROID)
set(BUILD_SHARED_LIBS ON)
diff --git a/cmake/macros/TargetZlib.cmake b/cmake/macros/TargetZlib.cmake
index 3eb0322ea0..ef746031e8 100644
--- a/cmake/macros/TargetZlib.cmake
+++ b/cmake/macros/TargetZlib.cmake
@@ -1,10 +1,10 @@
-#
+#
# Copyright 2015 High Fidelity, Inc.
# Created by Bradley Austin Davis on 2015/10/10
#
# Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-#
+#
macro(TARGET_ZLIB)
if (WIN32)