From 54647f0f085f34e964ceb485bf959165713e0097 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 10 Apr 2014 10:27:08 -0700
Subject: [PATCH] make sure gnutls define for ssize_t comes before gnutls
 include

---
 assignment-client/CMakeLists.txt       | 3 ++-
 interface/CMakeLists.txt               | 8 ++++----
 libraries/audio/CMakeLists.txt         | 2 +-
 libraries/avatars/CMakeLists.txt       | 3 ++-
 libraries/metavoxels/CMakeLists.txt    | 2 +-
 libraries/networking/CMakeLists.txt    | 5 +++++
 libraries/octree/CMakeLists.txt        | 4 ++--
 libraries/particles/CMakeLists.txt     | 3 +--
 libraries/script-engine/CMakeLists.txt | 4 ++--
 libraries/voxels/CMakeLists.txt        | 4 ++--
 voxel-edit/CMakeLists.txt              | 3 ++-
 11 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index d63d09520a..a8343e94ad 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -35,13 +35,14 @@ link_hifi_library(script-engine ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
 
 find_package(GnuTLS REQUIRED)
-include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
 
 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
 if (WIN32)
   add_definitions(-Dssize_t=long)
 endif ()
 
+include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
+
 if (UNIX)
   target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
 endif (UNIX)
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index d205719c21..6b1a0e81f9 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -188,15 +188,15 @@ endif (QXMPP_FOUND AND NOT DISABLE_QXMPP)
 # include headers for interface and InterfaceConfig.
 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}" "${GNUTLS_INCLUDE_DIR}")
-
 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
 if (WIN32)
   add_definitions(-Dssize_t=long)
 endif ()
 
+# include external library headers
+# use system flag so warnings are supressed
+include_directories(SYSTEM "${FACESHIFT_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
+
 target_link_libraries(
   ${TARGET_NAME}
   "${FACESHIFT_LIBRARIES}"
diff --git a/libraries/audio/CMakeLists.txt b/libraries/audio/CMakeLists.txt
index d5cd02f083..d946ae5b34 100644
--- a/libraries/audio/CMakeLists.txt
+++ b/libraries/audio/CMakeLists.txt
@@ -25,11 +25,11 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
 # link GnuTLS
 find_package(GnuTLS REQUIRED)
-include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
 
 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
 if (WIN32)
   add_definitions(-Dssize_t=long)
 endif ()
 
+include_directories(SYSTEM "${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 8c6b6417a1..3fa1ebcfe2 100644
--- a/libraries/avatars/CMakeLists.txt
+++ b/libraries/avatars/CMakeLists.txt
@@ -29,11 +29,12 @@ link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
 find_package(GnuTLS REQUIRED)
-include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
 
 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
 if (WIN32)
   add_definitions(-Dssize_t=long)
 endif ()
 
+
+include_directories(SYSTEM "${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 6d88006d84..e2a90cb085 100644
--- a/libraries/metavoxels/CMakeLists.txt
+++ b/libraries/metavoxels/CMakeLists.txt
@@ -28,11 +28,11 @@ include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
 find_package(GnuTLS REQUIRED)
-include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
 
 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
 if (WIN32)
   add_definitions(-Dssize_t=long)
 endif ()
 
+include_directories(SYSTEM "${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/networking/CMakeLists.txt b/libraries/networking/CMakeLists.txt
index 56e937e0d7..6d805cae6c 100644
--- a/libraries/networking/CMakeLists.txt
+++ b/libraries/networking/CMakeLists.txt
@@ -20,5 +20,10 @@ setup_hifi_library(${TARGET_NAME})
 include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
+# add a definition for ssize_t so that windows doesn't bail on gnutls.h
+if (WIN32)
+  add_definitions(-Dssize_t=long)
+endif ()
+
 include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
 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 0d2cb330b6..88554ed5f8 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -28,11 +28,11 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 find_package(ZLIB)
 find_package(GnuTLS REQUIRED)
 
-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
-
 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
 if (WIN32)
   add_definitions(-Dssize_t=long)
 endif ()
 
+
+include_directories(SYSTEM "${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/particles/CMakeLists.txt b/libraries/particles/CMakeLists.txt
index fa97f87854..26d2b7fc26 100644
--- a/libraries/particles/CMakeLists.txt
+++ b/libraries/particles/CMakeLists.txt
@@ -29,11 +29,10 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 find_package(ZLIB)
 find_package(GnuTLS REQUIRED)
 
-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
-
 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
 if (WIN32)
   add_definitions(-Dssize_t=long)
 endif ()
 
+include_directories(SYSTEM "${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/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt
index 414ac1e9eb..20569e2fe0 100644
--- a/libraries/script-engine/CMakeLists.txt
+++ b/libraries/script-engine/CMakeLists.txt
@@ -29,11 +29,11 @@ link_hifi_library(particles ${TARGET_NAME} "${ROOT_DIR}")
 # link ZLIB
 find_package(ZLIB)
 find_package(GnuTLS REQUIRED)
-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
 
 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
 if (WIN32)
   add_definitions(-Dssize_t=long)
 endif ()
 
-target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" "${GNUTLS_LIBRARY}" Qt5::Widgets)
+include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" "${GNUTLS_LIBRARY}" Qt5::Widgets)
\ No newline at end of file
diff --git a/libraries/voxels/CMakeLists.txt b/libraries/voxels/CMakeLists.txt
index dc13603450..bdba388594 100644
--- a/libraries/voxels/CMakeLists.txt
+++ b/libraries/voxels/CMakeLists.txt
@@ -30,11 +30,11 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 find_package(ZLIB)
 find_package(GnuTLS REQUIRED)
 
-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
-
 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
 if (WIN32)
   add_definitions(-Dssize_t=long)
 endif ()
 
+
+include_directories(SYSTEM "${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 65e82932b2..cc0a122bf0 100644
--- a/voxel-edit/CMakeLists.txt
+++ b/voxel-edit/CMakeLists.txt
@@ -36,7 +36,6 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
 # link GnuTLS
 find_package(GnuTLS REQUIRED)
-include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
 
 IF (WIN32)
 	target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
@@ -45,4 +44,6 @@ IF (WIN32)
   add_definitions(-Dssize_t=long)
 ENDIF(WIN32)
 
+include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
+
 target_link_libraries(${TARGET_NAME} Qt5::Script "${GNUTLS_LIBRARY}")
\ No newline at end of file