From 049be8b95f6ef3ce3add8de841adf0957969306b Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Fri, 7 Apr 2017 01:44:09 +0300 Subject: CPackIFW: Added new QtIFW versions for search --- Help/release/dev/cpackifw-search-algorithm.rst | 2 ++ Modules/CPackIFW.cmake | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/Help/release/dev/cpackifw-search-algorithm.rst b/Help/release/dev/cpackifw-search-algorithm.rst index c8ecfc6..f2e9985 100644 --- a/Help/release/dev/cpackifw-search-algorithm.rst +++ b/Help/release/dev/cpackifw-search-algorithm.rst @@ -3,3 +3,5 @@ cpackifw-search-algorithm * The :module:`CPackIFW` module learned the new hint :variable:`CPACK_IFW_ROOT` variable for finding the QtIFW tool suite installed in a non-standard place. +* The :module:`CPackIFW` module tries to find and use QtIFW tools of the `3.0` + and `3.1` versions. diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake index 1e8f4f6..099dd1c 100644 --- a/Modules/CPackIFW.cmake +++ b/Modules/CPackIFW.cmake @@ -633,6 +633,10 @@ set(_CPACK_IFW_PREFIXES "QtIFW-") set(_CPACK_IFW_VERSIONS + "3.1" + "3.1.0" + "3.0" + "3.0.0" "2.3" "2.3.0" "2.2" @@ -640,6 +644,7 @@ set(_CPACK_IFW_VERSIONS "2.1" "2.1.0" "2.0" + "2.0.5" "2.0.3" "2.0.2" "2.0.1" -- cgit v0.12