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

cmake fix

Browse source
This commit is contained in:
SamGondelman 2016-08-12 13:46:22 -07:00 committed by Brad Davis
parent 74e5814a48
commit 544606bccc
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/CMakeLists.txt
View file

@ -1,12 +1,12 @@
set(TARGET_NAME assignment-client) set(TARGET_NAME assignment-client)
setup_hifi_project(Core Gui Network Script Quick Widgets WebSockets)
# Fix up the rpath so macdeployqt works # Fix up the rpath so macdeployqt works
if (APPLE) if (APPLE)
set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks") set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
endif () endif ()
setup_hifi_project(Core Gui Network Script Quick Widgets WebSockets)
# link in the shared libraries # link in the shared libraries
link_hifi_libraries( link_hifi_libraries(
audio avatars octree gpu model fbx entities audio avatars octree gpu model fbx entities

6
domain-server/CMakeLists.txt
View file

@ -6,14 +6,14 @@ else ()
set(_SHOULD_SYMLINK_RESOURCES FALSE) set(_SHOULD_SYMLINK_RESOURCES FALSE)
endif () endif ()
# setup the project and link required Qt modules
setup_hifi_project(Network)
# Fix up the rpath so macdeployqt works # Fix up the rpath so macdeployqt works
if (APPLE) if (APPLE)
set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks") set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
endif () endif ()
# setup the project and link required Qt modules
setup_hifi_project(Network)
# TODO: find a solution that will handle web file changes in resources on windows without a re-build. # TODO: find a solution that will handle web file changes in resources on windows without a re-build.
# Currently the resources are only copied on post-build. If one is changed but the domain-server is not, they will # Currently the resources are only copied on post-build. If one is changed but the domain-server is not, they will
# not be re-copied. This is worked-around on OS X/UNIX by using a symlink. # not be re-copied. This is worked-around on OS X/UNIX by using a symlink.