diff options
author | Erlend Egeberg Aasland <erlend.aasland@innova.no> | 2020-11-12 10:41:59 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-11-12 14:53:51 (GMT) |
commit | 63ae96a31757f98861352bf84651c097c4b07ffa (patch) | |
tree | f779f6463582a3992373688df150d7d17300f2a2 /Modules/CPackIFW.cmake | |
parent | 7a04f45722b2cbe51e1586cd84d2c5ad90e759ed (diff) | |
download | CMake-63ae96a31757f98861352bf84651c097c4b07ffa.zip CMake-63ae96a31757f98861352bf84651c097c4b07ffa.tar.gz CMake-63ae96a31757f98861352bf84651c097c4b07ffa.tar.bz2 |
CPack/IFW: Add support for QtIFW 4.0
installerbase v4.0 segfaults on macOS if you pass `--framework-version`,
so re-order flags to try `--version` first.
Fixes: #21426
Diffstat (limited to 'Modules/CPackIFW.cmake')
-rw-r--r-- | Modules/CPackIFW.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake index 58e6a37..0c264e4 100644 --- a/Modules/CPackIFW.cmake +++ b/Modules/CPackIFW.cmake @@ -361,6 +361,7 @@ set(_CPACK_IFW_PREFIXES "QtIFW-") set(_CPACK_IFW_VERSIONS + "4.0" "3.2" "3.2.0" "3.1" @@ -456,7 +457,7 @@ mark_as_advanced(CPACK_IFW_FRAMEWORK_VERSION_TIMEOUT) if(CPACK_IFW_INSTALLERBASE_EXECUTABLE AND NOT CPACK_IFW_FRAMEWORK_VERSION_FORCED) set(CPACK_IFW_FRAMEWORK_VERSION) # Invoke version from "installerbase" executable - foreach(_ifw_version_argument --framework-version --version) + foreach(_ifw_version_argument --version --framework-version) if(NOT CPACK_IFW_FRAMEWORK_VERSION) execute_process(COMMAND "${CPACK_IFW_INSTALLERBASE_EXECUTABLE}" ${_ifw_version_argument} |