mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 15:20:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

CPack/IFW: Add support for QtIFW 4.0

Browse Source 
installerbase v4.0 segfaults on macOS if you pass `--framework-version`,
so re-order flags to try `--version` first.

Fixes: #21426
This commit is contained in:
Erlend Egeberg Aasland
2020-11-12 05:41:59 -05:00
committed by Brad King
parent 7a04f45722
commit 63ae96a317
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/CPackIFW.cmake
View File

@@ -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}