From 1d5644a85fb4bbed1e4d213d7690d80618d32a09 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 10 Apr 2014 09:45:57 -0700
Subject: [PATCH] link GnuTLS to octree library

---
 animation-server/CMakeLists.txt     | 10 +++++++++-
 domain-server/CMakeLists.txt        |  6 +++---
 libraries/octree/CMakeLists.txt     |  8 +++++---
 libraries/shared/src/SharedUtil.cpp |  5 +++++
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/animation-server/CMakeLists.txt b/animation-server/CMakeLists.txt
index d8fa8d97b2..490e01ffec 100644
--- a/animation-server/CMakeLists.txt
+++ b/animation-server/CMakeLists.txt
@@ -30,4 +30,12 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 
 # link the hifi networking library
-link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
\ No newline at end of file
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
+
+find_package(GnuTLS REQUIRED)
+
+# include the GnuTLS dir
+include_directories("${GNUTLS_INCLUDE_DIR}")
+
+# link GnuTLS
+target_link_libraries(${TARGET_NAME} "${GNUTLS_LIBRARY}")
\ No newline at end of file
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 0db22542b0..c960005995 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -38,12 +38,12 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
 
-# include the QCA dir
-include_directories(GNUTLS_INCLUDE_DIR)
+# include the GnuTLS dir
+include_directories("${GNUTLS_INCLUDE_DIR}")
 
 IF (WIN32)
   target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
 ENDIF(WIN32)
 
-# link QtNetwork and QCA
+# link QtNetwork and GnuTLS
 target_link_libraries(${TARGET_NAME} Qt5::Network "${GNUTLS_LIBRARY}")
\ No newline at end of file
diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt
index 5f4e66ea11..a4758e52f3 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -24,8 +24,10 @@ include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${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/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 9a59bb5493..0eecd00333 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -15,6 +15,11 @@
 #include <cctype>
 #include <time.h>
 
+#ifdef _WIN32
+#ifndef _timeval_
+#define _timeval_
+#endif
+
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
 #endif