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

install the server-console in a subdir on win32

Browse source
This commit is contained in:
Stephen Birarda 2016-01-22 11:15:49 -08:00
parent 5d8828e872
commit 5743c8046c
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cmake/macros/InstallBesideConsole.cmake
View file

@ -12,25 +12,17 @@
macro(install_beside_console) macro(install_beside_console)
if (WIN32 OR APPLE) if (WIN32 OR APPLE)
# install this component beside the installed server-console executable # install this component beside the installed server-console executable
if (APPLE)
set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents")
set(COMPONENT_APP_PATH "${CONSOLE_APP_CONTENTS}/MacOS/Components.app")
set(COMPONENT_DESTINATION "${COMPONENT_APP_PATH}/Contents/MacOS")
else ()
set(COMPONENT_DESTINATION ${CONSOLE_INSTALL_DIR})
endif ()
if (APPLE) if (APPLE)
install( install(
TARGETS ${TARGET_NAME} TARGETS ${TARGET_NAME}
RUNTIME DESTINATION ${COMPONENT_DESTINATION} RUNTIME DESTINATION ${COMPONENT_INSTALL_DIR}
COMPONENT ${SERVER_COMPONENT} COMPONENT ${SERVER_COMPONENT}
) )
else () else ()
# setup install of executable and things copied by fixup/windeployqt # setup install of executable and things copied by fixup/windeployqt
install( install(
FILES "$<TARGET_FILE_DIR:${TARGET_NAME}>/" FILES "$<TARGET_FILE_DIR:${TARGET_NAME}>/"
DESTINATION ${COMPONENT_DESTINATION} DESTINATION ${COMPONENT_INSTALL_DIR}
COMPONENT ${SERVER_COMPONENT} COMPONENT ${SERVER_COMPONENT}
) )
@ -40,16 +32,10 @@ macro(install_beside_console)
endif () endif ()
if (TARGET_NAME STREQUAL domain-server) if (TARGET_NAME STREQUAL domain-server)
if (APPLE)
set(RESOURCES_DESTINATION ${COMPONENT_DESTINATION})
else ()
set(RESOURCES_DESTINATION ${CONSOLE_INSTALL_DIR})
endif ()
# install the resources folder for the domain-server where its executable will be # install the resources folder for the domain-server where its executable will be
install( install(
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources
DESTINATION ${RESOURCES_DESTINATION} DESTINATION ${COMPONENT_INSTALL_DIR}
USE_SOURCE_PERMISSIONS USE_SOURCE_PERMISSIONS
COMPONENT ${SERVER_COMPONENT} COMPONENT ${SERVER_COMPONENT}
) )
@ -81,7 +67,7 @@ macro(install_beside_console)
endif () endif ()
# set variables used by manual ssleay library copy # set variables used by manual ssleay library copy
set(TARGET_INSTALL_DIR ${COMPONENT_DESTINATION}) set(TARGET_INSTALL_DIR ${COMPONENT_INSTALL_DIR})
set(TARGET_INSTALL_COMPONENT ${SERVER_COMPONENT}) set(TARGET_INSTALL_COMPONENT ${SERVER_COMPONENT})
manually_install_ssl_eay() manually_install_ssl_eay()

10
cmake/macros/SetPackagingParameters.cmake
View file

@ -52,8 +52,18 @@ macro(SET_PACKAGING_PARAMETERS)
set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME}) set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
set(INTERFACE_INSTALL_DIR ${DMG_SUBFOLDER_NAME}) set(INTERFACE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents")
set(COMPONENT_APP_PATH "${CONSOLE_APP_CONTENTS}/MacOS/Components.app")
set(COMPONENT_INSTALL_DIR "${COMPONENT_APP_PATH}/Contents/MacOS")
else ()
if (WIN32)
set(CONSOLE_INSTALL_DIR "server-console")
else () else ()
set(CONSOLE_INSTALL_DIR ".") set(CONSOLE_INSTALL_DIR ".")
endif ()
set(COMPONENT_INSTALL_DIR ".")
set(INTERFACE_INSTALL_DIR ".") set(INTERFACE_INSTALL_DIR ".")
endif () endif ()