mirror of
https://github.com/overte-org/overte.git
synced 2025-08-12 23:09:56 +02:00
link GnuTLS to the assignment-client, fix timeval in SharedUtil
This commit is contained in:
parent
1d5644a85f
commit
58298984d3
2 changed files with 5 additions and 2 deletions
|
@ -34,6 +34,9 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
link_hifi_library(script-engine ${TARGET_NAME} "${ROOT_DIR}")
|
link_hifi_library(script-engine ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
|
link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
|
|
||||||
|
find_package(GnuTLS REQUIRED)
|
||||||
|
include_directories("${GNUTLS_INCLUDE_DIR}")
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
|
target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
|
||||||
endif (UNIX)
|
endif (UNIX)
|
||||||
|
@ -42,4 +45,4 @@ IF (WIN32)
|
||||||
target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
|
target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
|
target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script "${GNUTLS_LIBRARY}")
|
|
@ -15,7 +15,7 @@
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef WIN32
|
||||||
#ifndef _timeval_
|
#ifndef _timeval_
|
||||||
#define _timeval_
|
#define _timeval_
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue