From a99b19d28ac8757cf48cacff335aca3583f9516d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 8 Aug 2014 12:57:46 -0700
Subject: [PATCH] make Qt5 and ZLIB required finds, add OpenSSL to interface

---
 cmake/macros/SetupHifiLibrary.cmake | 2 +-
 cmake/macros/SetupHifiProject.cmake | 2 +-
 interface/CMakeLists.txt            | 7 +++++--
 libraries/fbx/CMakeLists.txt        | 2 +-
 libraries/octree/CMakeLists.txt     | 2 +-
 libraries/voxels/CMakeLists.txt     | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/cmake/macros/SetupHifiLibrary.cmake b/cmake/macros/SetupHifiLibrary.cmake
index 3c2590d38d..7bb85f68f5 100644
--- a/cmake/macros/SetupHifiLibrary.cmake
+++ b/cmake/macros/SetupHifiLibrary.cmake
@@ -21,7 +21,7 @@ macro(SETUP_HIFI_LIBRARY)
   set(QT_MODULES_TO_LINK ${ARGN})
   list(APPEND QT_MODULES_TO_LINK Core)
   
-  find_package(Qt5 COMPONENTS ${QT_MODULES_TO_LINK})
+  find_package(Qt5 COMPONENTS ${QT_MODULES_TO_LINK} REQUIRED)
   
   foreach(QT_MODULE ${QT_MODULES_TO_LINK})
     get_target_property(QT_LIBRARY_LOCATION Qt5::${QT_MODULE} LOCATION)
diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake
index 62c215e595..d21e2c11bb 100644
--- a/cmake/macros/SetupHifiProject.cmake
+++ b/cmake/macros/SetupHifiProject.cmake
@@ -28,7 +28,7 @@ macro(SETUP_HIFI_PROJECT)
   set(QT_MODULES_TO_LINK ${ARGN})
   list(APPEND QT_MODULES_TO_LINK Core)
   
-  find_package(Qt5 COMPONENTS ${QT_MODULES_TO_LINK})
+  find_package(Qt5 COMPONENTS ${QT_MODULES_TO_LINK} REQUIRED)
   
   foreach(QT_MODULE ${QT_MODULES_TO_LINK})    
     target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE})
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index d58bea6f9e..a042cfd1c1 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -102,10 +102,12 @@ find_package(SDL)
 find_package(Sixense)
 find_package(Visage)
 find_package(LeapMotion)
-find_package(ZLIB)
 find_package(Qxmpp)
 find_package(RtMidi)
 
+find_package(ZLIB REQUIRED)
+find_package(OpenSSL REQUIRED)
+
 # perform standard include and linking for found externals
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
   string(TOUPPER ${EXTERNAL} UPPER_EXTERNAL)
@@ -157,9 +159,10 @@ endif ()
 
 # include headers for interface and InterfaceConfig.
 include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes")
+include_directories("${OPENSSL_INCLUDE_DIR}")
 
 target_link_libraries(
-  ${TARGET_NAME} "${ZLIB_LIBRARIES}"
+  ${TARGET_NAME} "${ZLIB_LIBRARIES}" "${OPENSSL_LIBRARIES}"
   Qt5::Gui Qt5::Network Qt5::Multimedia Qt5::OpenGL Qt5::Script Qt5::Svg Qt5::WebKitWidgets
 )
 
diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt
index 3cc510aed9..794c6edbe6 100644
--- a/libraries/fbx/CMakeLists.txt
+++ b/libraries/fbx/CMakeLists.txt
@@ -7,7 +7,7 @@ include_glm("${ROOT_DIR}")
 
 link_hifi_libraries(shared networking octree voxels)
 
-find_package(ZLIB)
+find_package(ZLIB REQUIRED)
 include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
 list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${ZLIB_LIBRARIES}")
 
diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt
index 193b058466..da641d1524 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -8,7 +8,7 @@ include_glm()
 link_hifi_libraries(shared networking)
 
 # find ZLIB and OpenSSL
-find_package(ZLIB)
+find_package(ZLIB REQUIRED)
 find_package(OpenSSL REQUIRED)
 
 include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${OPENSSL_INCLUDE_DIR}")
diff --git a/libraries/voxels/CMakeLists.txt b/libraries/voxels/CMakeLists.txt
index d9d8717fba..3214978a2a 100644
--- a/libraries/voxels/CMakeLists.txt
+++ b/libraries/voxels/CMakeLists.txt
@@ -8,7 +8,7 @@ include_glm()
 link_hifi_libraries(shared octree networking)
 
 # find ZLIB
-find_package(ZLIB)
+find_package(ZLIB REQUIRED)
 include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
 
 # add it to our list of libraries to link