Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:08:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

make sure gnutls define for ssize_t comes before gnutls include

Browse source
This commit is contained in:
Stephen Birarda 2014-04-10 10:27:08 -07:00
parent 2518d314ac
commit 54647f0f08
11 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assignment-client/CMakeLists.txt
View file

@ -35,13 +35,14 @@ 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) 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 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
if (WIN32) if (WIN32)
add_definitions(-Dssize_t=long) add_definitions(-Dssize_t=long)
endif () endif ()
include_directories(SYSTEM "${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)

8
interface/CMakeLists.txt
View file

@ -188,15 +188,15 @@ endif (QXMPP_FOUND AND NOT DISABLE_QXMPP)
# include headers for interface and InterfaceConfig. # include headers for interface and InterfaceConfig.
include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes") 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 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
if (WIN32) if (WIN32)
add_definitions(-Dssize_t=long) add_definitions(-Dssize_t=long)
endif () 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_link_libraries(
${TARGET_NAME} ${TARGET_NAME}
"${FACESHIFT_LIBRARIES}" "${FACESHIFT_LIBRARIES}"

2
libraries/audio/CMakeLists.txt
View file

@ -25,11 +25,11 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
# link GnuTLS # link GnuTLS
find_package(GnuTLS REQUIRED) 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 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
if (WIN32) if (WIN32)
add_definitions(-Dssize_t=long) add_definitions(-Dssize_t=long)
endif () endif ()
include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
target_link_libraries(${TARGET_NAME} "${GNUTLS_LIBRARY}") target_link_libraries(${TARGET_NAME} "${GNUTLS_LIBRARY}")

3
libraries/avatars/CMakeLists.txt
View file

@ -29,11 +29,12 @@ link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
find_package(GnuTLS REQUIRED) 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 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
if (WIN32) if (WIN32)
add_definitions(-Dssize_t=long) add_definitions(-Dssize_t=long)
endif () endif ()
include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
target_link_libraries(${TARGET_NAME} Qt5::Script "${GNUTLS_LIBRARY}") target_link_libraries(${TARGET_NAME} Qt5::Script "${GNUTLS_LIBRARY}")

2
libraries/metavoxels/CMakeLists.txt
View file

@ -28,11 +28,11 @@ include(${MACRO_DIR}/IncludeGLM.cmake)
include_glm(${TARGET_NAME} "${ROOT_DIR}") include_glm(${TARGET_NAME} "${ROOT_DIR}")
find_package(GnuTLS REQUIRED) 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 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
if (WIN32) if (WIN32)
add_definitions(-Dssize_t=long) add_definitions(-Dssize_t=long)
endif () endif ()
include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script "${GNUTLS_LIBRARY}") target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script "${GNUTLS_LIBRARY}")

5
libraries/networking/CMakeLists.txt
View file

@ -20,5 +20,10 @@ setup_hifi_library(${TARGET_NAME})
include(${MACRO_DIR}/IncludeGLM.cmake) include(${MACRO_DIR}/IncludeGLM.cmake)
include_glm(${TARGET_NAME} "${ROOT_DIR}") 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}") include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
target_link_libraries(${TARGET_NAME} Qt5::Network "${GNUTLS_LIBRARY}") target_link_libraries(${TARGET_NAME} Qt5::Network "${GNUTLS_LIBRARY}")

4
libraries/octree/CMakeLists.txt
View file

@ -28,11 +28,11 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
find_package(ZLIB) find_package(ZLIB)
find_package(GnuTLS REQUIRED) 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 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
if (WIN32) if (WIN32)
add_definitions(-Dssize_t=long) add_definitions(-Dssize_t=long)
endif () endif ()
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets "${GNUTLS_LIBRARY}") target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets "${GNUTLS_LIBRARY}")

3
libraries/particles/CMakeLists.txt
View file

@ -29,11 +29,10 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
find_package(ZLIB) find_package(ZLIB)
find_package(GnuTLS REQUIRED) 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 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
if (WIN32) if (WIN32)
add_definitions(-Dssize_t=long) add_definitions(-Dssize_t=long)
endif () endif ()
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets "${GNUTLS_LIBRARY}") target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets "${GNUTLS_LIBRARY}")

2
libraries/script-engine/CMakeLists.txt
View file

@ -29,11 +29,11 @@ link_hifi_library(particles ${TARGET_NAME} "${ROOT_DIR}")
# link ZLIB # link ZLIB
find_package(ZLIB) find_package(ZLIB)
find_package(GnuTLS REQUIRED) 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 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
if (WIN32) if (WIN32)
add_definitions(-Dssize_t=long) add_definitions(-Dssize_t=long)
endif () endif ()
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" "${GNUTLS_LIBRARY}" Qt5::Widgets) target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" "${GNUTLS_LIBRARY}" Qt5::Widgets)

4
libraries/voxels/CMakeLists.txt
View file

@ -30,11 +30,11 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
find_package(ZLIB) find_package(ZLIB)
find_package(GnuTLS REQUIRED) 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 # add a definition for ssize_t so that windows doesn't bail on gnutls.h
if (WIN32) if (WIN32)
add_definitions(-Dssize_t=long) add_definitions(-Dssize_t=long)
endif () endif ()
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" "${GNUTLS_LIBRARY}" Qt5::Widgets Qt5::Script) target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" "${GNUTLS_LIBRARY}" Qt5::Widgets Qt5::Script)

3
voxel-edit/CMakeLists.txt
View file

@ -36,7 +36,6 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
# link GnuTLS # link GnuTLS
find_package(GnuTLS REQUIRED) find_package(GnuTLS REQUIRED)
include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
IF (WIN32) IF (WIN32)
target_link_libraries(${TARGET_NAME} Winmm Ws2_32) target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
@ -45,4 +44,6 @@ IF (WIN32)
add_definitions(-Dssize_t=long) add_definitions(-Dssize_t=long)
ENDIF(WIN32) ENDIF(WIN32)
include_directories(SYSTEM "${GNUTLS_INCLUDE_DIR}")
target_link_libraries(${TARGET_NAME} Qt5::Script "${GNUTLS_LIBRARY}") target_link_libraries(${TARGET_NAME} Qt5::Script "${GNUTLS_LIBRARY}")