From 8e12e32dd26bcf9dcfbfe170396690005ede8dc0 Mon Sep 17 00:00:00 2001
From: Leonardo Murillo <leo@highfidelity.io>
Date: Mon, 23 Nov 2015 14:21:06 -0600
Subject: [PATCH] Checkpoint - Windows specifics

---
 cmake/externals/quazip/CMakeLists.txt | 27 +++++++++++++++++++++------
 cmake/externals/zlib/CMakeLists.txt   | 14 +++++++-------
 stack-manager/CMakeLists.txt          |  5 ++---
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/cmake/externals/quazip/CMakeLists.txt b/cmake/externals/quazip/CMakeLists.txt
index e6a8a0fa2a..68506c14cd 100644
--- a/cmake/externals/quazip/CMakeLists.txt
+++ b/cmake/externals/quazip/CMakeLists.txt
@@ -1,4 +1,9 @@
 set(EXTERNAL_NAME quazip)
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+
+# Choose correct version of zlib for QuaZip build
+include(SelectLibraryConfigurations)
+select_library_configurations(ZLIB)
 
 include(ExternalProject)
 ExternalProject_Add(
@@ -6,12 +11,14 @@ ExternalProject_Add(
   URL https://s3-us-west-1.amazonaws.com/hifi-production/dependencies/quazip-0.6.2.zip
   URL_MD5 514851970f1a14d815bdc3ad6267af4d
   BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=$ENV{QT_CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=$ENV{QT_CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib -DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIR} -DZLIB_LIBRARY=${ZLIB_LIBRARY_DEBUG}
   LOG_DOWNLOAD 1
   LOG_CONFIGURE 1
   LOG_BUILD 1
 )
 
+add_dependencies(quazip zlib)
+
 # Hide this external target (for ide users)
 set_target_properties(${EXTERNAL_NAME} PROPERTIES 
 	FOLDER "hidden/externals"
@@ -19,10 +26,18 @@ set_target_properties(${EXTERNAL_NAME} PROPERTIES
 	BUILD_WITH_INSTALL_RPATH True)
 
 ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE PATH "List of QuaZip include directories")
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${INSTALL_DIR}/include CACHE PATH "List of QuaZip include directories")
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${${EXTERNAL_NAME_UPPER}_INCLUDE_DIR} CACHE PATH "List of QuaZip include directories")
+set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${INSTALL_DIR}/lib CACHE FILEPATH "Location of ZLib DLL")
 
 if (APPLE)
-  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libquazip.1.0.0.dylib CACHE PATH "List of QuaZip libraries")
-endif ()
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/libquazip.1.0.0.dylib CACHE FILEPATH "Location of QuaZip release library")
+elseif (WIN32)
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/quazip.lib CACHE FILEPATH "Location of QuaZip release library")
+endif()
+
+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") 
\ No newline at end of file
diff --git a/cmake/externals/zlib/CMakeLists.txt b/cmake/externals/zlib/CMakeLists.txt
index 0d279cc469..22a2703c46 100644
--- a/cmake/externals/zlib/CMakeLists.txt
+++ b/cmake/externals/zlib/CMakeLists.txt
@@ -4,13 +4,13 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 include(ExternalProject)
 
 ExternalProject_Add(
-${EXTERNAL_NAME}
-URL http://zlib.net/zlib128.zip
-CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
-LOG_DOWNLOAD 1
-LOG_CONFIGURE 1
-LOG_BUILD 1
+  ${EXTERNAL_NAME}
+  URL http://zlib.net/zlib128.zip
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+  BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
+  LOG_DOWNLOAD 1
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
 )
   
 # Hide this external target (for ide users)
diff --git a/stack-manager/CMakeLists.txt b/stack-manager/CMakeLists.txt
index 45ad9686c0..142921c515 100644
--- a/stack-manager/CMakeLists.txt
+++ b/stack-manager/CMakeLists.txt
@@ -3,8 +3,9 @@ set(BUILD_BUNDLE YES)
 setup_hifi_project(Widgets Gui Svg Core Network WebKitWidgets)
 
 if (WIN32)
-  find_package(ZLIB REQUIRED)
+  target_zlib()
 endif ()
+target_quazip()
 
 if (DEFINED ENV{JOB_ID})
   set(PR_BUILD "false")
@@ -30,8 +31,6 @@ include_directories(
     ${ZLIB_INCLUDE_DIRS}
 )
 
-target_quazip()
-
 if (APPLE)
   set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)
   set(MACOSX_BUNDLE_BUNDLE_NAME "Stack Manager")