add a networking library and link from appropriate targets

animation-server/CMakeLists.txt

@@ -29,4 +29,5 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 # link in the hifi voxels library
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 
-
+# link the hifi networking library
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")

assignment-client/CMakeLists.txt

@@ -13,7 +13,6 @@ set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/")
 
 find_package(Qt5 COMPONENTS Network Script Widgets)
-find_package(GnuTLS REQUIRED)
 
 include("${MACRO_DIR}/SetupHifiProject.cmake")
 setup_hifi_project(${TARGET_NAME} TRUE)
@@ -31,6 +30,7 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(particles ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(script-engine ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
 
@@ -42,5 +42,4 @@ IF (WIN32)
 	target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
 ENDIF(WIN32)
 
-include_directories("${GNUTLS_INCLUDE_DIR}")
+target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
-target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script "${GNUTLS_LIBRARY}")

assignment-client/src/avatars/AvatarMixerClientData.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <PacketHeaders.h>
+
 #include "AvatarMixerClientData.h"
 
 AvatarMixerClientData::AvatarMixerClientData() :

domain-server/CMakeLists.txt

@@ -34,6 +34,7 @@ add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
 
 # link the shared hifi library
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+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}")
 

interface/CMakeLists.txt

@@ -32,8 +32,8 @@ elseif (UNIX)
   # include the right GL headers for UNIX
   set(GL_HEADERS "#include <GL/gl.h>\n#include <GL/glut.h>\n#include <GL/glext.h>")
 elseif (WIN32)
-    add_definitions( -D_USE_MATH_DEFINES ) # apparently needed to get M_PI and other defines from cmath/math.h
+    add_definitions(-D_USE_MATH_DEFINES) # apparently needed to get M_PI and other defines from cmath/math.h
-    add_definitions( -DWINDOWS_LEAN_AND_MEAN ) # needed to make sure windows doesn't go to crazy with its defines
+    add_definitions(-DWINDOWS_LEAN_AND_MEAN) # needed to make sure windows doesn't go to crazy with its defines
 
     set(GL_HEADERS "#include <windowshacks.h>\n#include <GL/glew.h>\n#include <GL/glut.h>")
 endif ()
@@ -67,7 +67,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)
@@ -125,6 +124,7 @@ link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(particles ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(avatars ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(audio ${TARGET_NAME} "${ROOT_DIR}")
@@ -189,7 +189,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}" "${GNUTLS_INCLUDE_DIR}")
+include_directories(SYSTEM "${FACESHIFT_INCLUDE_DIRS}")
 
 target_link_libraries(
   ${TARGET_NAME}
@@ -197,7 +197,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}"
 )
 
 if (APPLE)

libraries/audio/CMakeLists.txt

@@ -20,4 +20,5 @@ include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
-link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
+link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")

libraries/avatars/CMakeLists.txt

@@ -26,5 +26,6 @@ link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 # link in the hifi voxels library
 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)

libraries/metavoxels/CMakeLists.txt

@@ -20,8 +20,11 @@ auto_mtc(${TARGET_NAME} "${ROOT_DIR}")
 include(${MACRO_DIR}/SetupHifiLibrary.cmake)
 setup_hifi_library(${TARGET_NAME} "${AUTOMTC_SRC}")
 
+# link in the networking library
+include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+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)
+target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
-

libraries/networking/CMakeLists.txt

@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 2.8)
+
+if (WIN32)
+  cmake_policy (SET CMP0020 NEW)
+endif (WIN32)
+
+set(ROOT_DIR ../..)
+set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
+
+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})
+
+# include GLM
+include(${MACRO_DIR}/IncludeGLM.cmake)
+include_glm(${TARGET_NAME} "${ROOT_DIR}")
+
+include_directories("${GNUTLS_INCLUDE_DIR}")
+target_link_libraries(${TARGET_NAME} Qt5::Network "${GNUTLS_LIBRARY}")

libraries/networking/src/AccountManager.cpp

@@ -1,6 +1,6 @@
 //
 //  AccountManager.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/AccountManager.h

@@ -1,6 +1,6 @@
 //
 //  AccountManager.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/Assignment.cpp

@@ -1,6 +1,6 @@
 //
 //  Assignment.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 8/22/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/Assignment.h

@@ -1,6 +1,6 @@
 //
 //  Assignment.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 8/22/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/DTLSClientSession.cpp

@@ -1,6 +1,6 @@
 //
 //  DTLSClientSession.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2014-04-01.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/DTLSClientSession.h

@@ -1,6 +1,6 @@
 //
 //  DTLSClientSession.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2014-04-01.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/DTLSSession.cpp

@@ -1,6 +1,6 @@
 //
 //  DTLSSession.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2014-04-01.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/DTLSSession.h

@@ -1,6 +1,6 @@
 //
 //  DTLSSession.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2014-04-01.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/DataServerAccountInfo.cpp

@@ -1,6 +1,6 @@
 //
 //  DataServerAccountInfo.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/DataServerAccountInfo.h

@@ -1,6 +1,6 @@
 //
 //  DataServerAccountInfo.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/21/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/DomainHandler.cpp

@@ -1,6 +1,6 @@
 //
 //  DomainHandler.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/DomainHandler.h

@@ -1,6 +1,6 @@
 //
 //  DomainHandler.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/DummyDTLSSession.cpp

@@ -1,6 +1,6 @@
 //
 //  DummyDTLSSession.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2014-04-04.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/DummyDTLSSession.h

@@ -1,6 +1,6 @@
 //
 //  DummyDTLSSession.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2014-04-04.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/HifiSockAddr.cpp

@@ -1,6 +1,6 @@
 //
 //  HifiSockAddr.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 11/26/2013.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/HifiSockAddr.h

@@ -1,6 +1,6 @@
 //
 //  HifiSockAddr.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 11/26/2013.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/LimitedNodeList.cpp

@@ -1,6 +1,6 @@
 //
 //  LimitedNodeList.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/LimitedNodeList.h

@@ -1,6 +1,6 @@
 //
 //  LimitedNodeList.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/Logging.cpp

@@ -1,6 +1,6 @@
 //
 //  Logging.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 6/11/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/Logging.h

@@ -1,6 +1,6 @@
 //
 //  Logging.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 6/11/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/NetworkPacket.cpp

@@ -1,6 +1,6 @@
 //
 //  NetworkPacket.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Brad Hefta-Gaub on 8/9/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/NetworkPacket.h

@@ -1,6 +1,6 @@
 //
 //  NetworkPacket.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Brad Hefta-Gaub on 8/9/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/Node.cpp

@@ -1,6 +1,6 @@
 //
 //  Node.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/Node.h

@@ -1,6 +1,6 @@
 //
 //  Node.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/NodeData.cpp

@@ -1,6 +1,6 @@
 //
 //  NodeData.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/19/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/NodeData.h

@@ -1,6 +1,6 @@
 //
 //  NodeData.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/19/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/NodeList.cpp

@@ -1,6 +1,6 @@
 //
 //  NodeList.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/NodeList.h

@@ -1,6 +1,6 @@
 //
 //  NodeList.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/OAuthAccessToken.cpp

@@ -1,6 +1,6 @@
 //
 //  OAuthAccessToken.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/OAuthAccessToken.h

@@ -1,6 +1,6 @@
 //
 //  OAuthAccessToken.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/networking/src/PacketHeaders.cpp

@@ -1,6 +1,6 @@
 //
 //  PacketHeaders.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 6/28/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/PacketHeaders.h

@@ -1,6 +1,6 @@
 //
 //  PacketHeaders.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 4/8/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/PacketSender.cpp

@@ -1,6 +1,6 @@
 //
 //  PacketSender.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Brad Hefta-Gaub on 8/12/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/PacketSender.h

@@ -1,6 +1,6 @@
 //
 //  PacketSender.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Brad Hefta-Gaub on 8/12/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/ReceivedPacketProcessor.cpp

@@ -1,6 +1,6 @@
 //
 //  ReceivedPacketProcessor.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Brad Hefta-Gaub on 8/12/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/networking/src/ReceivedPacketProcessor.h

@@ -1,6 +1,6 @@
 //
 //  ReceivedPacketProcessor.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Brad Hefta-Gaub on 8/12/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/octree/CMakeLists.txt

@@ -22,6 +22,7 @@ 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 ZLIB
 find_package(ZLIB)

libraries/particles/CMakeLists.txt

@@ -23,6 +23,7 @@ include_glm(${TARGET_NAME} "${ROOT_DIR}")
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 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
 find_package(ZLIB)

libraries/shared/CMakeLists.txt

@@ -11,7 +11,6 @@ set(TARGET_NAME shared)
 project(${TARGET_NAME})
 
 find_package(Qt5 COMPONENTS Network Widgets Xml)
-find_package(GnuTLS REQUIRED)
 
 include(${MACRO_DIR}/SetupHifiLibrary.cmake)
 setup_hifi_library(${TARGET_NAME})
@@ -33,5 +32,4 @@ if (UNIX AND NOT APPLE)
     target_link_libraries(${TARGET_NAME} "${CMAKE_THREAD_LIBS_INIT}")
 endif (UNIX AND NOT APPLE)
 
-include_directories("${GNUTLS_INCLUDE_DIR}")
+target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets)
-target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets "${GNUTLS_LIBRARY}")

libraries/shared/src/SharedUtil.cpp

@@ -26,7 +26,6 @@
 #include <QtCore/QDebug>
 
 #include "OctalCode.h"
-#include "PacketHeaders.h"
 #include "SharedUtil.h"
 
 quint64 usecTimestamp(const timeval *time) {

libraries/shared/src/SharedUtil.h

@@ -30,8 +30,6 @@
 #include <sys/time.h>
 #endif
 
-#include "PacketHeaders.h"
-
 const int BYTES_PER_COLOR = 3;
 const int BYTES_PER_FLAGS = 1;
 typedef unsigned char rgbColor[BYTES_PER_COLOR];

libraries/voxels/CMakeLists.txt

@@ -24,6 +24,7 @@ include_glm(${TARGET_NAME} "${ROOT_DIR}")
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 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
 find_package(ZLIB)

voxel-edit/CMakeLists.txt

@@ -31,6 +31,9 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 # link in the hifi voxels library
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 
+# link in the hifi networking library
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
+
 IF (WIN32)
 	target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
 ENDIF(WIN32)