don't look for GnuTLS from cmake

animation-server/CMakeLists.txt

@@ -30,17 +30,4 @@ 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}")
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
-
-find_package(GnuTLS REQUIRED)
-
-# include the GnuTLS dir
-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 ()
-
-# link GnuTLS
-target_link_libraries(${TARGET_NAME} "${GNUTLS_LIBRARY}")

assignment-client/CMakeLists.txt

@@ -37,15 +37,6 @@ link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(script-engine ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
 
-find_package(GnuTLS REQUIRED)
-
-# 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)
@@ -54,4 +45,4 @@ IF (WIN32)
 	target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
 ENDIF(WIN32)
 
-target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script "${GNUTLS_LIBRARY}")
+target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)

cmake/modules/FindGnuTLS.cmake

@@ -1,41 +0,0 @@
-# 
-#  FindGnuTLS.cmake
-# 
-#  Try to find the GnuTLS library
-#
-#  You can provide a GNUTLS_ROOT_DIR which contains lib and include directories
-#
-#  Once done this will define
-#
-#  GNUTLS_FOUND - system found GnuTLS
-#  GNUTLS_INCLUDE_DIR - the GnuTLS include directory
-#  GNUTLS_LIBRARY - Link this to use GnuTLS
-#
-#  Created on 3/31/2014 by Stephen Birarda
-#  Copyright (c) 2014 High Fidelity
-#
-#  Distributed under the Apache License, Version 2.0.
-#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-#
-
-if (GNUTLS_LIBRARY AND GNUTLS_INCLUDE_DIRS)
-  # in cache already
-  set(GNUTLS_FOUND TRUE)
-else ()  
-  set(GNUTLS_SEARCH_DIRS "${GNUTLS_ROOT_DIR}" "$ENV{HIFI_LIB_DIR}/gnutls")
-  
-  find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h PATH_SUFFIXES include HINTS ${GNUTLS_SEARCH_DIRS})
-
-  find_library(GNUTLS_LIBRARY NAMES gnutls libgnutls libgnutls-28 PATH_SUFFIXES lib HINTS ${GNUTLS_SEARCH_DIRS})
-  
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(GNUTLS DEFAULT_MSG GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY)
-  
-  if (WIN32 AND NOT GNUTLS_FOUND)
-    message(STATUS "If you're generating a MSVC environment, you'll need to run the command")
-    message(STATUS "$GnuTLS-DIR\\bin>lib /def:libgnutls-28.def")
-    message(STATUS "From the MSVC command prompt to generate the .lib file and copy it into")
-    message(STATUS "the GnuTLS lib folder. Replace $GnuTLS-DIR in the command with the directory")
-    message(STATUS "containing GnuTLS.")
-  endif ()
-endif ()

domain-server/CMakeLists.txt

@@ -17,7 +17,6 @@ include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
 find_package(Qt5Network REQUIRED)
-find_package(GnuTLS REQUIRED)
 
 include(${MACRO_DIR}/SetupHifiProject.cmake)
 
@@ -38,17 +37,9 @@ 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 GnuTLS dir
-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 ()
-
 IF (WIN32)
   target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
 ENDIF(WIN32)
 
-# link QtNetwork and GnuTLS
+# link QtNetwork
-target_link_libraries(${TARGET_NAME} Qt5::Network "${GNUTLS_LIBRARY}")
+target_link_libraries(${TARGET_NAME} Qt5::Network)

interface/CMakeLists.txt

@@ -69,7 +69,6 @@ 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)
@@ -212,14 +211,9 @@ endif (QXMPP_FOUND AND NOT DISABLE_QXMPP)
 # include headers for interface and InterfaceConfig.
 include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes")
 
-# 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}")
+include_directories(SYSTEM "${FACESHIFT_INCLUDE_DIRS}")
 
 target_link_libraries(
   ${TARGET_NAME}
@@ -227,7 +221,6 @@ 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}"
 )
 
 # assume we are using a Qt build without bearer management

libraries/animation/CMakeLists.txt

@@ -26,12 +26,5 @@ link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}")
 
 # link ZLIB
 find_package(ZLIB)
-find_package(GnuTLS REQUIRED)
 
-# add a definition for ssize_t so that windows doesn't bail on gnutls.h
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
-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)

libraries/audio/CMakeLists.txt

@@ -21,15 +21,4 @@ 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}")
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
-
-# link GnuTLS
-find_package(GnuTLS REQUIRED)
-
-# 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}")

libraries/avatars/CMakeLists.txt

@@ -28,13 +28,4 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
-find_package(GnuTLS REQUIRED)
+target_link_libraries(${TARGET_NAME} Qt5::Script)
-
-# 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}")

libraries/fbx/CMakeLists.txt

@@ -24,15 +24,8 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 
-# link ZLIB and GnuTLS
+# link ZLIB
 find_package(ZLIB)
-find_package(GnuTLS REQUIRED)
 
-# add a definition for ssize_t so that windows doesn't bail on gnutls.h
+include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-if (WIN32)
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
-  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}")

libraries/metavoxels/CMakeLists.txt

@@ -27,12 +27,4 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
-find_package(GnuTLS REQUIRED)
+target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
-
-# 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}")

libraries/models/CMakeLists.txt

@@ -33,14 +33,8 @@ link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}")
 # for streamable
 link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
 
-# link ZLIB and GnuTLS
+# link ZLIB
 find_package(ZLIB)
-find_package(GnuTLS REQUIRED)
 
-# add a definition for ssize_t so that windows doesn't bail on gnutls.h
+include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-if (WIN32)
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
-  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}")

libraries/networking/CMakeLists.txt

@@ -11,7 +11,6 @@ set(TARGET_NAME networking)
 project(${TARGET_NAME})
 
 find_package(Qt5 COMPONENTS Network)
-find_package(GnuTLS REQUIRED)
 
 include(${MACRO_DIR}/SetupHifiLibrary.cmake)
 setup_hifi_library(${TARGET_NAME})
@@ -20,10 +19,4 @@ 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
+target_link_libraries(${TARGET_NAME} Qt5::Network)
-if (WIN32)
-  add_definitions(-Dssize_t=long)
-endif ()
-
-include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
-target_link_libraries(${TARGET_NAME} Qt5::Network "${GNUTLS_LIBRARY}")

libraries/octree/CMakeLists.txt

@@ -24,15 +24,8 @@ include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
-# link ZLIB and GnuTLS
+# link ZLIB
 find_package(ZLIB)
-find_package(GnuTLS REQUIRED)
 
-# add a definition for ssize_t so that windows doesn't bail on gnutls.h
+include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-if (WIN32)
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
-  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}")

libraries/particles/CMakeLists.txt

@@ -27,14 +27,8 @@ link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}")
 
-# link ZLIB and GnuTLS
+# link ZLIB
 find_package(ZLIB)
-find_package(GnuTLS REQUIRED)
 
-# add a definition for ssize_t so that windows doesn't bail on gnutls.h
+include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-if (WIN32)
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
-  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}")

libraries/script-engine/CMakeLists.txt

@@ -31,12 +31,6 @@ link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}")
 
 # link ZLIB
 find_package(ZLIB)
-find_package(GnuTLS REQUIRED)
 
-# add a definition for ssize_t so that windows doesn't bail on gnutls.h
+include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-if (WIN32)
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
-  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)

libraries/voxels/CMakeLists.txt

@@ -26,15 +26,8 @@ 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 and GnuTLS
+# link ZLIB
 find_package(ZLIB)
-find_package(GnuTLS REQUIRED)
 
-# add a definition for ssize_t so that windows doesn't bail on gnutls.h
+include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-if (WIN32)
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets Qt5::Script)
-  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)

voxel-edit/CMakeLists.txt

@@ -34,16 +34,8 @@ 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)
-
 IF (WIN32)
 	target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
-  
-  # add a definition for ssize_t so that windows doesn't bail on gnutls.h  
-  add_definitions(-Dssize_t=long)
 ENDIF(WIN32)
 
-include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
+target_link_libraries(${TARGET_NAME} Qt5::Script)
-
-target_link_libraries(${TARGET_NAME} Qt5::Script "${GNUTLS_LIBRARY}")