Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

generate a componentized server/client installer

Browse source
This commit is contained in:
Stephen Birarda 2016-01-05 13:18:01 -08:00
parent 550b47f58b
commit 92064fe507
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -212,7 +212,8 @@ endif()
set_packaging_parameters() set_packaging_parameters()
# setup component categories for installer # setup component categories for installer
set(APP_COMPONENT Runtime) set(CLIENT_COMPONENT client)
set(SERVER_COMPONENT server)
# add subdirectories for all targets # add subdirectories for all targets
if (NOT ANDROID) if (NOT ANDROID)

15
cmake/macros/GenerateInstallers.cmake
View file

@ -12,21 +12,26 @@
macro(GENERATE_INSTALLERS) macro(GENERATE_INSTALLERS)
include(CPackComponent) include(CPackComponent)
set(CPACK_PACKAGE_NAME "High Fidelity")
set(CPACK_PACKAGE_VENDOR "High Fidelity, Inc.")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "High Fidelity")
if (APPLE) if (APPLE)
install(TARGETS ${CLIENT_TARGET} BUNDLE DESTINATION bin COMPONENT ${APP_COMPONENT}) install(TARGETS ${CLIENT_TARGET} BUNDLE DESTINATION bin COMPONENT ${APP_COMPONENT})
else () else ()
install(TARGETS ${CLIENT_TARGET} RUNTIME DESTINATION bin COMPONENT ${APP_COMPONENT}) install(TARGETS ${CLIENT_TARGET} RUNTIME DESTINATION bin COMPONENT ${APP_COMPONENT})
endif () endif ()
cpack_add_component(${APP_COMPONENT} cpack_add_component(${CLIENT_COMPONENT}
DISPLAY_NAME "Applications" DISPLAY_NAME "High Fidelity Client"
Description "The High Fidelity Applications"
GROUP "Runtime"
) )
cpack_add_component_group(Runtime) cpack_add_component(${SERVER_COMPONENT}
DISPLAY_NAME "High Fidelity Server"
)
include(CPack) include(CPack)
# if (DEPLOY_PACKAGE AND WIN32) # if (DEPLOY_PACKAGE AND WIN32)
# file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/package-bundle") # file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/package-bundle")
# find_program(MAKENSIS_COMMAND makensis PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\NSIS]) # find_program(MAKENSIS_COMMAND makensis PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\NSIS])

4
interface/CMakeLists.txt
View file

@ -204,7 +204,7 @@ if (APPLE)
target_link_libraries(${TARGET_NAME} ${OpenGL} ${AppKit}) target_link_libraries(${TARGET_NAME} ${OpenGL} ${AppKit})
# setup install of OS X interface bundle # setup install of OS X interface bundle
install(TARGETS ${TARGET_NAME} BUNDLE DESTINATION bin COMPONENT ${APP_COMPONENT}) install(TARGETS ${TARGET_NAME} BUNDLE DESTINATION bin COMPONENT ${CLIENT_COMPONENT})
else (APPLE) else (APPLE)
# copy the resources files beside the executable # copy the resources files beside the executable
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
@ -217,7 +217,7 @@ else (APPLE)
) )
# setup install of interface target # setup install of interface target
install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin COMPONENT ${APP_COMPONENT}) install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin COMPONENT ${CLIENT_COMPONENT})
# link target to external libraries # link target to external libraries
if (WIN32) if (WIN32)