diff options
| author | JinWang An <jinwang.an@samsung.com> | 2022-12-27 17:20:19 +0900 |
|---|---|---|
| committer | JinWang An <jinwang.an@samsung.com> | 2022-12-27 17:20:19 +0900 |
| commit | c2873843eeadaa4dcbfd9658fb4d9b26d6f90dee (patch) | |
| tree | e1ccdb2c6e25d8d77b80011c9263a2a86d3542e1 /CMakeCPackOptions.cmake.in | |
| parent | d314a0e5335beba15b9ef5e6a4cb9ada3cd20468 (diff) | |
| download | cmake-c2873843eeadaa4dcbfd9658fb4d9b26d6f90dee.tar.gz cmake-c2873843eeadaa4dcbfd9658fb4d9b26d6f90dee.tar.bz2 cmake-c2873843eeadaa4dcbfd9658fb4d9b26d6f90dee.zip | |
Imported Upstream version 3.24.0upstream/3.24.0
Diffstat (limited to 'CMakeCPackOptions.cmake.in')
| -rw-r--r-- | CMakeCPackOptions.cmake.in | 15 |
1 files changed, 7 insertions, 8 deletions
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" ) |