Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-07 14:59:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove DDE as component of installer

Browse source
This commit is contained in:
Stephen Birarda 2016-01-14 16:16:08 -08:00
parent 5730772f6b
commit 59b4c2545f
2 changed files with 0 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cmake/macros/GenerateInstallers.cmake
View file

@ -56,40 +56,11 @@ macro(GENERATE_INSTALLERS)
set(CPACK_OSX_PACKAGE_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET}) set(CPACK_OSX_PACKAGE_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
endif () endif ()
# setup downloads
cpack_configure_downloads(
http://hifi-production.s3.amazonaws.com/optionals/
ADD_REMOVE
)
set(CLIENT_GROUP client-group)
# add a component group for the client
cpack_add_component_group(
${CLIENT_GROUP}
DISPLAY_NAME "Client"
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 (WIN32 AND DEFINED ENV{DDE_ARCHIVE_DIR})
# add a download component for DDE
cpack_add_component(
${DDE_COMPONENT}
DISPLAY_NAME "Webcam Body Movement"
DEPENDS ${CLIENT_COMPONENT}
DOWNLOADED
DISABLE
GROUP ${CLIENT_GROUP}
ARCHIVE_FILE "DDE"
)
endif ()
cpack_add_component(${SERVER_COMPONENT} cpack_add_component(${SERVER_COMPONENT}
DISPLAY_NAME "High Fidelity Server" DISPLAY_NAME "High Fidelity Server"
) )

18
interface/CMakeLists.txt
View file

@ -261,24 +261,6 @@ endif()
# call the fixup_interface macro to add required bundling commands for installation # call the fixup_interface macro to add required bundling commands for installation
fixup_interface() fixup_interface()
# if present, add an install of the DDE components
# which will be presented as an option during install
if (APPLE AND DEFINED ENV{DDE_APP_PATH})
install(
DIRECTORY ENV{DDE_APP_PATH}
DESTINATION ${INTERFACE_INSTALL_APP_PATH}/Contents/MacOS
COMPONENT ${DDE_COMPONENT}
)
endif ()
if (WIN32 AND DEFINED ENV{DDE_ARCHIVE_DIR})
install(
DIRECTORY $ENV{DDE_ARCHIVE_DIR}/
DESTINATION ${INTERFACE_INSTALL_DIR}/dde
COMPONENT ${DDE_COMPONENT}
)
endif ()
if (WIN32) if (WIN32)
set(EXTRA_DEPLOY_OPTIONS "--qmldir ${PROJECT_SOURCE_DIR}/resources/qml") set(EXTRA_DEPLOY_OPTIONS "--qmldir ${PROJECT_SOURCE_DIR}/resources/qml")
endif() endif()