diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake index 1357c87261..c046a8ac1a 100644 --- a/cmake/macros/GenerateInstallers.cmake +++ b/cmake/macros/GenerateInstallers.cmake @@ -56,40 +56,11 @@ macro(GENERATE_INSTALLERS) set(CPACK_OSX_PACKAGE_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET}) 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( ${CLIENT_COMPONENT} 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} DISPLAY_NAME "High Fidelity Server" ) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 2649462477..23d9c9c7f8 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -261,24 +261,6 @@ endif() # call the fixup_interface macro to add required bundling commands for installation 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) set(EXTRA_DEPLOY_OPTIONS "--qmldir ${PROJECT_SOURCE_DIR}/resources/qml") endif()