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)