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

drop the resources folder for DS beside executable

Browse source
This commit is contained in:
Stephen Birarda 2016-01-06 15:38:03 -08:00
parent 71307c1280
commit 3906a4fe38
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cmake/macros/InstallBesideConsole.cmake
View file

@ -14,9 +14,8 @@ macro(install_beside_console)
if (APPLE) if (APPLE)
set(SHELL_APP_CONTENTS "Components.app/Contents") set(SHELL_APP_CONTENTS "Components.app/Contents")
set(COMPONENT_DESTINATION "${SHELL_APP_CONTENTS}/MacOS") set(COMPONENT_DESTINATION "${SHELL_APP_CONTENTS}/MacOS")
else () else ()
set(COMPONENT_DESTINATION .) set(COMPONENT_DESTINATION ${CONSOLE_INSTALL_PATH})
endif () endif ()
install( install(
@ -25,6 +24,21 @@ macro(install_beside_console)
COMPONENT ${SERVER_COMPONENT} COMPONENT ${SERVER_COMPONENT}
) )
if (TARGET_NAME STREQUAL domain-server)
if (APPLE)
set(RESOURCES_DESTINATION ${CONSOLE_INSTALL_PATH}/Contents/MacOS)
else ()
set(RESOURCES_DESTINATION ${CONSOLE_INSTALL_PATH})
endif ()
# install the resources folder for the domain-server where its executable will be
install(
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources
DESTINATION ${RESOURCES_DESTINATION}
USE_SOURCE_PERMISSIONS
)
endif ()
if (APPLE) if (APPLE)
# during the install phase, call fixup to drop the shared libraries for these components in the right place # during the install phase, call fixup to drop the shared libraries for these components in the right place
set(EXECUTABLE_NEEDING_FIXUP "\${CMAKE_INSTALL_PREFIX}/${COMPONENT_DESTINATION}/${TARGET_NAME}") set(EXECUTABLE_NEEDING_FIXUP "\${CMAKE_INSTALL_PREFIX}/${COMPONENT_DESTINATION}/${TARGET_NAME}")
@ -34,7 +48,7 @@ macro(install_beside_console)
" COMPONENT ${SERVER_COMPONENT}) " COMPONENT ${SERVER_COMPONENT})
# once installed copy the contents of the shell Components.app to the console application # once installed copy the contents of the shell Components.app to the console application
set(CONSOLE_INSTALL_PATH "Applications/High Fidelity/Server Console.app")
set(INSTALLED_CONSOLE_CONTENTS "\${CMAKE_INSTALL_PREFIX}/${CONSOLE_INSTALL_PATH}/Contents") set(INSTALLED_CONSOLE_CONTENTS "\${CMAKE_INSTALL_PREFIX}/${CONSOLE_INSTALL_PATH}/Contents")
set(INSTALLED_SHELL_CONTENTS "\${CMAKE_INSTALL_PREFIX}/${SHELL_APP_CONTENTS}") set(INSTALLED_SHELL_CONTENTS "\${CMAKE_INSTALL_PREFIX}/${SHELL_APP_CONTENTS}")

6
cmake/macros/SetPackagingParameters.cmake
View file

@ -13,6 +13,12 @@
macro(SET_PACKAGING_PARAMETERS) macro(SET_PACKAGING_PARAMETERS)
if (APPLE)
set(CONSOLE_INSTALL_PATH "Applications/High Fidelity/Server Console.app")
else ()
set(CONSOLE_INSTALL_PATH ".")
endif()
if (DEFINED ENV{JOB_ID}) if (DEFINED ENV{JOB_ID})
set(DEPLOY_PACKAGE TRUE) set(DEPLOY_PACKAGE TRUE)
set(BUILD_SEQ $ENV{JOB_ID}) set(BUILD_SEQ $ENV{JOB_ID})