Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 17:50:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

link GnuTLS to octree library

Browse source
This commit is contained in:
Stephen Birarda 2014-04-10 09:45:57 -07:00
parent 7e2b73906c
commit 1d5644a85f
4 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
animation-server/CMakeLists.txt
View file

@ -30,4 +30,12 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
# link the hifi networking library # 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("${GNUTLS_INCLUDE_DIR}")
# link GnuTLS
target_link_libraries(${TARGET_NAME} "${GNUTLS_LIBRARY}")

6
domain-server/CMakeLists.txt
View file

@ -38,12 +38,12 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
# include the QCA dir # include the GnuTLS dir
include_directories(GNUTLS_INCLUDE_DIR) include_directories("${GNUTLS_INCLUDE_DIR}")
IF (WIN32) IF (WIN32)
target_link_libraries(${TARGET_NAME} Winmm Ws2_32) target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
ENDIF(WIN32) ENDIF(WIN32)
# link QtNetwork and QCA # link QtNetwork and GnuTLS
target_link_libraries(${TARGET_NAME} Qt5::Network "${GNUTLS_LIBRARY}") target_link_libraries(${TARGET_NAME} Qt5::Network "${GNUTLS_LIBRARY}")

8
libraries/octree/CMakeLists.txt
View file

@ -24,8 +24,10 @@ 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}") link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
# link ZLIB # link ZLIB and GnuTLS
find_package(ZLIB) 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}")

5
libraries/shared/src/SharedUtil.cpp
View file

@ -15,6 +15,11 @@
#include <cctype> #include <cctype>
#include <time.h> #include <time.h>
#ifdef _WIN32
#ifndef _timeval_
#define _timeval_
#endif
#ifdef __APPLE__ #ifdef __APPLE__
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#endif #endif