mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'qtifw-4.0'

Browse Source 
63ae96a317 CPack/IFW: Add support for QtIFW 4.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5502
This commit is contained in:
Brad King
2020-11-13 14:43:40 +00:00
committed by Kitware Robot
parent bc4c65a609 63ae96a317
commit 5dd1d841f3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/CPackIFW.cmake
+2 -1
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}