From fcd9d9b81096e86adcdde89b19a414d8ce8a5f54 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 8 Jan 2016 13:00:01 -0800 Subject: [PATCH] setup optional dde archive for windows --- cmake/macros/GenerateInstallers.cmake | 2 +- interface/CMakeLists.txt | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake index cea767fec9..fc95da6be3 100644 --- a/cmake/macros/GenerateInstallers.cmake +++ b/cmake/macros/GenerateInstallers.cmake @@ -41,7 +41,7 @@ macro(GENERATE_INSTALLERS) DISPLAY_NAME "High Fidelity Client" ) - if (WIN32 AND DDE_APP_PATH) + if (WIN32 AND DEFINED ENV{DDE_ARCHIVE_DIR}) # add a download component for DDE cpack_add_component( ${DDE_COMPONENT} diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 4dcc86f03c..802e409d04 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -245,13 +245,20 @@ fixup_interface() # which will be presented as an option during install if (APPLE AND DEFINED ENV{DDE_APP_PATH}) install( - DIRECTORY $ENV{DDE_APP_PATH} - DIRECTORY_PERMISSIONS + 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_APP_PATH} + DESTINATION ${INTERFACE_INSTALL_DIR}/dde + COMPONENT ${DDE_COMPONENT} + ) +endif () + if (WIN32) set(EXTRA_DEPLOY_OPTIONS "--qmldir ${PROJECT_SOURCE_DIR}/resources/qml") endif()