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

try to fix rpath issue

Browse source
This commit is contained in:
SamGondelman 2016-08-12 13:35:57 -07:00 committed by Brad Davis
parent 7e0ad52cd5
commit 74e5814a48
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assignment-client/CMakeLists.txt
View file

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

5
domain-server/CMakeLists.txt
View file

@ -6,6 +6,11 @@ else ()
set(_SHOULD_SYMLINK_RESOURCES FALSE) set(_SHOULD_SYMLINK_RESOURCES FALSE)
endif () endif ()
# Fix up the rpath so macdeployqt works
if (APPLE)
set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
endif ()
# setup the project and link required Qt modules # setup the project and link required Qt modules
setup_hifi_project(Network) setup_hifi_project(Network)

3
interface/CMakeLists.txt
View file

@ -123,7 +123,8 @@ if (APPLE)
add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM}) add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM})
# make sure the output name for the .app bundle is correct # make sure the output name for the .app bundle is correct
set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME ${INTERFACE_BUNDLE_NAME}) # Fix up the rpath so macdeployqt works
set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
elseif (WIN32) elseif (WIN32)
# configure an rc file for the chosen icon # configure an rc file for the chosen icon
set(CONFIGURE_ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/icon/${INTERFACE_ICON_FILENAME}") set(CONFIGURE_ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/icon/${INTERFACE_ICON_FILENAME}")