From 68c445e7183a74930fc1534fb8cb8f06bc57d732 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 10 Apr 2014 10:00:10 -0700
Subject: [PATCH] link GnuTLS to targets linking the networking library

---
 interface/CMakeLists.txt            | 4 +++-
 libraries/audio/CMakeLists.txt      | 7 ++++++-
 libraries/avatars/CMakeLists.txt    | 4 +++-
 libraries/metavoxels/CMakeLists.txt | 4 +++-
 libraries/particles/CMakeLists.txt  | 7 ++++---
 libraries/voxels/CMakeLists.txt     | 8 +++++---
 voxel-edit/CMakeLists.txt           | 6 +++++-
 7 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 6a3186bb70..d435f048ab 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -67,6 +67,7 @@ foreach(EXTERNAL_SOURCE_SUBDIR ${EXTERNAL_SOURCE_SUBDIRS})
 endforeach(EXTERNAL_SOURCE_SUBDIR)
 
 find_package(Qt5 COMPONENTS Core Gui Multimedia Network OpenGL Script Svg WebKit WebKitWidgets Xml UiTools)
+find_package(GnuTLS REQUIRED)
 
 # grab the ui files in resources/ui
 file (GLOB_RECURSE QT_UI_FILES ui/*.ui)
@@ -189,7 +190,7 @@ include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes"
 
 # include external library headers
 # use system flag so warnings are supressed
-include_directories(SYSTEM "${FACESHIFT_INCLUDE_DIRS}")
+include_directories(SYSTEM "${FACESHIFT_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
 
 target_link_libraries(
   ${TARGET_NAME}
@@ -197,6 +198,7 @@ target_link_libraries(
   "${ZLIB_LIBRARIES}"
   Qt5::Core Qt5::Gui Qt5::Multimedia Qt5::Network Qt5::OpenGL 
   Qt5::Script Qt5::Svg Qt5::WebKit Qt5::WebKitWidgets Qt5::Xml Qt5::UiTools
+  "${GNUTLS_LIBRARY}"
 )
 
 if (APPLE)
diff --git a/libraries/audio/CMakeLists.txt b/libraries/audio/CMakeLists.txt
index 0bf0ba9904..213e04c43a 100644
--- a/libraries/audio/CMakeLists.txt
+++ b/libraries/audio/CMakeLists.txt
@@ -21,4 +21,9 @@ include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
\ No newline at end of file
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
+
+# link GnuTLS
+find_package(GnuTLS REQUIRED)
+include_directories("${GNUTLS_INCLUDE_DIR}")
+target_link_libraries(${TARGET_NAME} "${GNUTLS_LIBRARY}")
\ No newline at end of file
diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt
index 9816282dda..fe31eb6a06 100644
--- a/libraries/avatars/CMakeLists.txt
+++ b/libraries/avatars/CMakeLists.txt
@@ -28,4 +28,6 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
-target_link_libraries(${TARGET_NAME} Qt5::Script)
\ No newline at end of file
+find_package(GnuTLS REQUIRED)
+include_directories("${GNUTLS_INCLUDE_DIR}")
+target_link_libraries(${TARGET_NAME} Qt5::Script "${GNUTLS_LIBRARY}")
\ No newline at end of file
diff --git a/libraries/metavoxels/CMakeLists.txt b/libraries/metavoxels/CMakeLists.txt
index 7a8319815a..4ef9fcc9cb 100644
--- a/libraries/metavoxels/CMakeLists.txt
+++ b/libraries/metavoxels/CMakeLists.txt
@@ -27,4 +27,6 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
-target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
\ No newline at end of file
+find_package(GnuTLS REQUIRED)
+include_directories("${GNUTLS_INCLUDE_DIR}")
+target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script "${GNUTLS_LIBRARY}")
\ No newline at end of file
diff --git a/libraries/particles/CMakeLists.txt b/libraries/particles/CMakeLists.txt
index e6c554dbdf..4df0859195 100644
--- a/libraries/particles/CMakeLists.txt
+++ b/libraries/particles/CMakeLists.txt
@@ -25,8 +25,9 @@ link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
-# link ZLIB
+# link ZLIB and GnuTLS
 find_package(ZLIB)
-include_directories("${ZLIB_INCLUDE_DIRS}")
+find_package(GnuTLS REQUIRED)
 
-target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
+include_directories("${ZLIB_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets "${GNUTLS_LIBRARY}")
\ No newline at end of file
diff --git a/libraries/voxels/CMakeLists.txt b/libraries/voxels/CMakeLists.txt
index 1cb838a6f0..68ce7c13aa 100644
--- a/libraries/voxels/CMakeLists.txt
+++ b/libraries/voxels/CMakeLists.txt
@@ -26,8 +26,10 @@ link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
-# link ZLIB
+# link ZLIB and GnuTLS
 find_package(ZLIB)
-include_directories("${ZLIB_INCLUDE_DIRS}")
+find_package(GnuTLS REQUIRED)
 
-target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets Qt5::Script)
+include_directories("${ZLIB_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
+
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" "${GNUTLS_LIBRARY}" Qt5::Widgets Qt5::Script)
\ No newline at end of file
diff --git a/voxel-edit/CMakeLists.txt b/voxel-edit/CMakeLists.txt
index ce3c542691..883b1debe4 100644
--- a/voxel-edit/CMakeLists.txt
+++ b/voxel-edit/CMakeLists.txt
@@ -34,8 +34,12 @@ link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 # link in the hifi networking library
 link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
+# link GnuTLS
+find_package(GnuTLS REQUIRED)
+include_directories("${GNUTLS_INCLUDE_DIR}")
+
 IF (WIN32)
 	target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
 ENDIF(WIN32)
 
-target_link_libraries(${TARGET_NAME} Qt5::Script)
\ No newline at end of file
+target_link_libraries(${TARGET_NAME} Qt5::Script "${GNUTLS_LIBRARY}")
\ No newline at end of file