From 1059e9a6355b1d72f0d9020e4c0b5f681ea908a0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 7 Aug 2014 15:50:15 -0700 Subject: [PATCH] add back more required Qt modules --- libraries/avatars/CMakeLists.txt | 7 +++++++ libraries/fbx/CMakeLists.txt | 8 ++++---- libraries/metavoxels/CMakeLists.txt | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt index feb1e68557..c7defaafe2 100644 --- a/libraries/avatars/CMakeLists.txt +++ b/libraries/avatars/CMakeLists.txt @@ -19,6 +19,13 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}") +find_package(Qt5Network) + +# set a property indicating the libraries we are dependent on and link them to ourselves +set(DEPENDENCY_LIBRARIES Qt5::Network) +set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES ${DEPENDENCY_LIBRARIES}) +target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES}) + # add a definition for ssize_t so that windows doesn't bail if (WIN32) add_definitions(-Dssize_t=long) diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt index a125de1320..ba51fe2e06 100644 --- a/libraries/fbx/CMakeLists.txt +++ b/libraries/fbx/CMakeLists.txt @@ -23,10 +23,10 @@ find_package(ZLIB) include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") -# bubble up the libraries we are dependent on and link them to ourselves -set(REQUIRED_DEPENDENCY_LIBRARIES "${ZLIB_LIBRARIES}") -set(SUB_DEPENDENCY_LIBRARIES ${REQUIRED_DEPENDENCY_LIBRARIES} PARENT_SCOPE) -target_link_libraries(${TARGET_NAME} ${REQUIRED_DEPENDENCY_LIBRARIES}) +# set a property indicating the libraries we are dependent on and link them to ourselves +set(DEPENDENCY_LIBRARIES "${ZLIB_LIBRARIES}") +set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES ${DEPENDENCY_LIBRARIES}) +target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES}) # add a definition for ssize_t so that windows doesn't bail if (WIN32) diff --git a/libraries/metavoxels/CMakeLists.txt b/libraries/metavoxels/CMakeLists.txt index c419f664a0..10feb55199 100644 --- a/libraries/metavoxels/CMakeLists.txt +++ b/libraries/metavoxels/CMakeLists.txt @@ -21,9 +21,10 @@ include_glm(${TARGET_NAME} "${ROOT_DIR}") find_package(Qt5Script) find_package(Qt5Widgets) +find_package(Qt5Network) # set a property indicating the libraries we are dependent on and link them to ourselves -set(DEPENDENCY_LIBRARIES Qt5::Script Qt5::Widgets) +set(DEPENDENCY_LIBRARIES Qt5::Script Qt5::Widgets Qt5::Network) set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES "${DEPENDENCY_LIBRARIES}") target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES})