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

switch to a DragNDrop installer for OS X

Browse source
This commit is contained in:
Stephen Birarda 2016-01-07 14:10:33 -08:00
parent dedb7e2778
commit 1a10d2eb72
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cmake/macros/GenerateInstallers.cmake
View file

@ -18,6 +18,7 @@ macro(GENERATE_INSTALLERS)
if (APPLE) if (APPLE)
set(CPACK_PACKAGE_INSTALL_DIRECTORY "/") set(CPACK_PACKAGE_INSTALL_DIRECTORY "/")
set(CPACK_PACKAGING_INSTALL_PREFIX /) set(CPACK_PACKAGING_INSTALL_PREFIX /)
set(CPACK_OSX_PACKAGE_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
endif () endif ()
# setup downloads # setup downloads
@ -29,25 +30,23 @@ macro(GENERATE_INSTALLERS)
set(CLIENT_GROUP client) set(CLIENT_GROUP client)
# add a component group for the client # add a component group for the client
cpack_add_component_group( # cpack_add_component_group(
${CLIENT_GROUP} # ${CLIENT_GROUP}
DISPLAY_NAME "Client" # DISPLAY_NAME "Client"
EXPANDED # EXPANDED
) # )
cpack_add_component( cpack_add_component(
${CLIENT_COMPONENT} ${CLIENT_COMPONENT}
DISPLAY_NAME "High Fidelity Client" DISPLAY_NAME "High Fidelity Client"
GROUP ${CLIENT_GROUP}
) )
if (DDE_APP_PATH) if (WIN32 AND DDE_APP_PATH)
# add a download component for DDE # add a download component for DDE
cpack_add_component( cpack_add_component(
${DDE_COMPONENT} ${DDE_COMPONENT}
DISPLAY_NAME "Webcam Body Movement" DISPLAY_NAME "Webcam Body Movement"
DEPENDS ${CLIENT_COMPONENT} DEPENDS ${CLIENT_COMPONENT}
GROUP ${CLIENT_GROUP}
DOWNLOADED DOWNLOADED
ARCHIVE_FILE "DDE" ARCHIVE_FILE "DDE"
) )

8
cmake/macros/SetPackagingParameters.cmake
View file

@ -44,12 +44,12 @@ macro(SET_PACKAGING_PARAMETERS)
endif () endif ()
if (APPLE) if (APPLE)
set(CONSOLE_INSTALL_DIR "Applications/High Fidelity") set(CONSOLE_INSTALL_DIR ".")
set(CONSOLE_APPLICATION_NAME "Server Console.app") set(CONSOLE_APPLICATION_NAME "Server Console.app")
set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${CONSOLE_APPLICATION_NAME}") set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_APPLICATION_NAME}")
set(INTERFACE_INSTALL_DIR "Applications/High Fidelity") set(INTERFACE_INSTALL_DIR ".")
set(INTERFACE_INSTALL_APP_PATH "${INTERFACE_INSTALL_DIR}/${INTERFACE_BUNDLE_NAME}.app") set(INTERFACE_INSTALL_APP_PATH "${INTERFACE_BUNDLE_NAME}.app")
else () else ()
set(CONSOLE_INSTALL_DIR ".") set(CONSOLE_INSTALL_DIR ".")
set(INTERFACE_INSTALL_DIR ".") set(INTERFACE_INSTALL_DIR ".")

2
console/CMakeLists.txt
View file

@ -25,7 +25,7 @@ endif ()
# install the packaged Server Console # install the packaged Server Console
install( install(
PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}/Server Console.app" PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}/Server Console.app"
DESTINATION "Applications/High Fidelity" DESTINATION ${CONSOLE_INSTALL_DIR}
COMPONENT ${SERVER_COMPONENT} COMPONENT ${SERVER_COMPONENT}
) )