diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-13 14:43:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-13 14:44:27 (GMT) |
| commit | 140e06e34462c3c7194945d5b61653bc45b98be2 (patch) | |
| tree | 6aa64c41b5e4244397ba8a7ee757a4ee074c3ec3 /Modules | |
| parent | ddd6979aab04cd322564c2254762954123453190 (diff) | |
| parent | 63ae96a31757f98861352bf84651c097c4b07ffa (diff) | |
| download | CMake-140e06e34462c3c7194945d5b61653bc45b98be2.zip CMake-140e06e34462c3c7194945d5b61653bc45b98be2.tar.gz CMake-140e06e34462c3c7194945d5b61653bc45b98be2.tar.bz2 | |
Merge topic 'qtifw-4.0' into release-3.19
63ae96a317 CPack/IFW: Add support for QtIFW 4.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5502
Diffstat (limited to 'Modules')
| -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} |