Parcourir la source

CPackIFW: Added new QtIFW versions for search

Konstantin Podsvirov il y a 8 ans
Parent
commit
049be8b95f
2 fichiers modifiés avec 7 ajouts et 0 suppressions
  1. 2 0
      Help/release/dev/cpackifw-search-algorithm.rst
  2. 5 0
      Modules/CPackIFW.cmake

+ 2 - 0
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.

+ 5 - 0
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"