Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-26 19:30:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use shared dependency linking macro in hifi projects

Browse source
This commit is contained in:
Stephen Birarda 2014-08-08 11:51:12 -07:00
parent 26f7b1ba62
commit e4d01d269c
12 changed files with 40 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
domain-server/CMakeLists.txt
View file

@ -1,6 +1,7 @@
set(TARGET_NAME domain-server) set(TARGET_NAME domain-server)
setup_hifi_project(${TARGET_NAME}) # setup the project and link required Qt modules
setup_hifi_project(${TARGET_NAME} Network)
# remove and then copy the files for the webserver # remove and then copy the files for the webserver
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
@ -11,8 +12,8 @@ add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
"${PROJECT_SOURCE_DIR}/resources/web" "${PROJECT_SOURCE_DIR}/resources/web"
$<TARGET_FILE_DIR:${TARGET_NAME}>/resources/web) $<TARGET_FILE_DIR:${TARGET_NAME}>/resources/web)
# link the shared hifi library # link the shared hifi libraries
link_hifi_libraries(${TARGET_NAME} embedded-webserver networking shared) link_hifi_libraries(${TARGET_NAME} embedded-webserver networking shared)
find_package(Qt5 COMPONENTS Network Widgets) # link any shared dependencies
target_link_libraries(${TARGET_NAME} Qt5::Network) link_shared_dependencies_to_target(${TARGET_NAME})

3
interface/CMakeLists.txt
View file

@ -209,3 +209,6 @@ else (APPLE)
target_link_libraries(${TARGET_NAME} "${GLEW_LIBRARIES}" wsock32.lib opengl32.lib) target_link_libraries(${TARGET_NAME} "${GLEW_LIBRARIES}" wsock32.lib opengl32.lib)
endif() endif()
endif (APPLE) endif (APPLE)
# link any dependencies bubbled up from our linked dependencies
link_shared_dependencies_to_target(${TARGET_NAME})

3
tests/audio/CMakeLists.txt
View file

@ -7,3 +7,6 @@ include_glm(${TARGET_NAME} ${ROOT_DIR})
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(${TARGET_NAME} shared audio networking) link_hifi_libraries(${TARGET_NAME} shared audio networking)
# link any shared dependencies
link_shared_dependencies_to_target(${TARGET_NAME})

3
tests/jitter/CMakeLists.txt
View file

@ -4,3 +4,6 @@ setup_hifi_project(${TARGET_NAME})
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(${TARGET_NAME} shared networking) link_hifi_libraries(${TARGET_NAME} shared networking)
# link any shared dependencies
link_shared_dependencies_to_target(${TARGET_NAME})

8
tests/metavoxels/CMakeLists.txt
View file

@ -1,13 +1,11 @@
set(TARGET_NAME metavoxel-tests) set(TARGET_NAME metavoxel-tests)
find_package(Qt5 COMPONENTS Network Script Widgets)
auto_mtc(${TARGET_NAME} "${ROOT_DIR}") auto_mtc(${TARGET_NAME} "${ROOT_DIR}")
setup_hifi_project(${TARGET_NAME}) setup_hifi_project(${TARGET_NAME} Network Script Widgets)
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(${TARGET_NAME} metavoxels networking shared) link_hifi_libraries(${TARGET_NAME} metavoxels networking shared)
target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script) # link any shared dependencies
link_shared_dependencies_to_target(${TARGET_NAME})

2
tests/networking/CMakeLists.txt
View file

@ -5,3 +5,5 @@ setup_hifi_project(${TARGET_NAME})
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(${TARGET_NAME} shared networking) link_hifi_libraries(${TARGET_NAME} shared networking)
# link any shared dependencies
link_shared_dependencies_to_target(${TARGET_NAME})

5
tests/octree/CMakeLists.txt
View file

@ -5,6 +5,5 @@ setup_hifi_project(${TARGET_NAME})
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(${TARGET_NAME} octree) link_hifi_libraries(${TARGET_NAME} octree)
IF (WIN32) # link any shared dependencies
target_link_libraries(${TARGET_NAME} wsock32.lib) link_shared_dependencies_to_target(${TARGET_NAME})
ENDIF(WIN32)

2
tests/physics/CMakeLists.txt
View file

@ -5,3 +5,5 @@ setup_hifi_project(${TARGET_NAME})
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(${TARGET_NAME} shared) link_hifi_libraries(${TARGET_NAME} shared)
# link any shared dependencies
link_shared_dependencies_to_target(${TARGET_NAME})

3
tests/shared/CMakeLists.txt
View file

@ -4,3 +4,6 @@ setup_hifi_project(${TARGET_NAME})
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(${TARGET_NAME} shared) link_hifi_libraries(${TARGET_NAME} shared)
# link any shared dependencies
link_shared_dependencies_to_target(${TARGET_NAME})

3
tools/bitstream2json/CMakeLists.txt
View file

@ -1,2 +1,5 @@
set(TARGET_NAME bitstream2json) set(TARGET_NAME bitstream2json)
setup_hifi_project(${TARGET_NAME}) setup_hifi_project(${TARGET_NAME})
# link any shared dependencies
link_shared_dependencies_to_target(${TARGET_NAME})

3
tools/mtc/CMakeLists.txt
View file

@ -1,2 +1,5 @@
set(TARGET_NAME mtc) set(TARGET_NAME mtc)
setup_hifi_project(${TARGET_NAME}) setup_hifi_project(${TARGET_NAME})
# link any shared dependencies
link_shared_dependencies_to_target(${TARGET_NAME})

3
voxel-edit/CMakeLists.txt
View file

@ -1,3 +1,6 @@
set(TARGET_NAME voxel-edit) set(TARGET_NAME voxel-edit)
setup_hifi_project(${TARGET_NAME}) setup_hifi_project(${TARGET_NAME})
# link any shared dependencies
link_shared_dependencies_to_target(${TARGET_NAME})