From c2873843eeadaa4dcbfd9658fb4d9b26d6f90dee Mon Sep 17 00:00:00 2001 From: JinWang An Date: Tue, 27 Dec 2022 17:20:19 +0900 Subject: Imported Upstream version 3.24.0 --- CMakeCPackOptions.cmake.in | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'CMakeCPackOptions.cmake.in') diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index 2a4bcc589..f354362b0 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -198,14 +198,6 @@ if(CPACK_GENERATOR MATCHES "IFW") endif() -if("${CPACK_GENERATOR}" STREQUAL "PackageMaker") - if(CMAKE_PACKAGE_QTGUI) - set(CPACK_PACKAGE_DEFAULT_LOCATION "/Applications") - else() - set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr") - endif() -endif() - if("${CPACK_GENERATOR}" STREQUAL "DragNDrop") set(CPACK_DMG_BACKGROUND_IMAGE "@CMake_SOURCE_DIR@/Packaging/CMakeDMGBackground.tif") @@ -256,6 +248,13 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX") set(CPACK_WIX_LIGHT_EXTRA_FLAGS "-dcl:high") + if(NOT "$ENV{CMAKE_CI_PACKAGE}" STREQUAL "") + # Suppress validation. It does not work without + # an interactive session or an admin account. + # https://github.com/wixtoolset/issues/issues/3968 + list(APPEND CPACK_WIX_LIGHT_EXTRA_FLAGS "-sval") + endif() + set(CPACK_WIX_UI_BANNER "@CMake_SOURCE_DIR@/Utilities/Release/WiX/ui_banner.jpg" ) -- cgit v1.2.3