mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-04-08 07:02:25 +02:00
make Qt5 and ZLIB required finds, add OpenSSL to interface
This commit is contained in:
parent
b1310c065c
commit
a99b19d28a
6 changed files with 10 additions and 7 deletions
|
@ -21,7 +21,7 @@ macro(SETUP_HIFI_LIBRARY)
|
|||
set(QT_MODULES_TO_LINK ${ARGN})
|
||||
list(APPEND QT_MODULES_TO_LINK Core)
|
||||
|
||||
find_package(Qt5 COMPONENTS ${QT_MODULES_TO_LINK})
|
||||
find_package(Qt5 COMPONENTS ${QT_MODULES_TO_LINK} REQUIRED)
|
||||
|
||||
foreach(QT_MODULE ${QT_MODULES_TO_LINK})
|
||||
get_target_property(QT_LIBRARY_LOCATION Qt5::${QT_MODULE} LOCATION)
|
||||
|
|
|
@ -28,7 +28,7 @@ macro(SETUP_HIFI_PROJECT)
|
|||
set(QT_MODULES_TO_LINK ${ARGN})
|
||||
list(APPEND QT_MODULES_TO_LINK Core)
|
||||
|
||||
find_package(Qt5 COMPONENTS ${QT_MODULES_TO_LINK})
|
||||
find_package(Qt5 COMPONENTS ${QT_MODULES_TO_LINK} REQUIRED)
|
||||
|
||||
foreach(QT_MODULE ${QT_MODULES_TO_LINK})
|
||||
target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE})
|
||||
|
|
|
@ -102,10 +102,12 @@ find_package(SDL)
|
|||
find_package(Sixense)
|
||||
find_package(Visage)
|
||||
find_package(LeapMotion)
|
||||
find_package(ZLIB)
|
||||
find_package(Qxmpp)
|
||||
find_package(RtMidi)
|
||||
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
# perform standard include and linking for found externals
|
||||
foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
|
||||
string(TOUPPER ${EXTERNAL} UPPER_EXTERNAL)
|
||||
|
@ -157,9 +159,10 @@ endif ()
|
|||
|
||||
# include headers for interface and InterfaceConfig.
|
||||
include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes")
|
||||
include_directories("${OPENSSL_INCLUDE_DIR}")
|
||||
|
||||
target_link_libraries(
|
||||
${TARGET_NAME} "${ZLIB_LIBRARIES}"
|
||||
${TARGET_NAME} "${ZLIB_LIBRARIES}" "${OPENSSL_LIBRARIES}"
|
||||
Qt5::Gui Qt5::Network Qt5::Multimedia Qt5::OpenGL Qt5::Script Qt5::Svg Qt5::WebKitWidgets
|
||||
)
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ include_glm("${ROOT_DIR}")
|
|||
|
||||
link_hifi_libraries(shared networking octree voxels)
|
||||
|
||||
find_package(ZLIB)
|
||||
find_package(ZLIB REQUIRED)
|
||||
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
||||
list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${ZLIB_LIBRARIES}")
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ include_glm()
|
|||
link_hifi_libraries(shared networking)
|
||||
|
||||
# find ZLIB and OpenSSL
|
||||
find_package(ZLIB)
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${OPENSSL_INCLUDE_DIR}")
|
||||
|
|
|
@ -8,7 +8,7 @@ include_glm()
|
|||
link_hifi_libraries(shared octree networking)
|
||||
|
||||
# find ZLIB
|
||||
find_package(ZLIB)
|
||||
find_package(ZLIB REQUIRED)
|
||||
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
||||
|
||||
# add it to our list of libraries to link
|
||||
|
|
Loading…
Reference in a new issue