[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-930-gf4570ad

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f4570ad0d275896fa14d09bfa871b938b4a3b894 (commit)
       via  20cc76c93a7f7ba1dd8a38e8311c0e9702395b27 (commit)
      from  54eed9ada656ea5f43d55d4e7b03945889365689 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4570ad0d275896fa14d09bfa871b938b4a3b894
commit f4570ad0d275896fa14d09bfa871b938b4a3b894
Merge: 54eed9a 20cc76c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 3 09:28:50 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 3 09:28:50 2016 -0400

    Merge topic 'cpackifw-search-algorithm' into next
    
    20cc76c9 CPackIFW: Update search to find QtIFW distributed with QtSDK


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20cc76c93a7f7ba1dd8a38e8311c0e9702395b27
commit 20cc76c93a7f7ba1dd8a38e8311c0e9702395b27
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Wed Nov 2 23:15:07 2016 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 3 09:28:15 2016 -0400

    CPackIFW: Update search to find QtIFW distributed with QtSDK
    
    Also avoid CMP0007 warnings.

diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
index 6c93ddb..08078cb 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -433,11 +433,15 @@
 
 # Default path
 
-set(_CPACK_IFW_PATHS
-  "${QTIFWDIR}"
-  "$ENV{QTIFWDIR}"
-  "${QTDIR}"
-  "$ENV{QTIFWDIR}")
+foreach(_CPACK_IFW_PATH_VAR "QTIFWDIR" "QTDIR")
+  if(DEFINED ${_CPACK_IFW_PATH_VAR}
+    AND NOT "${${_CPACK_IFW_PATH_VAR}}" STREQUAL "")
+    list(APPEND _CPACK_IFW_PATHS "${${_CPACK_IFW_PATH_VAR}}")
+  endif()
+  if(NOT "$ENV{${_CPACK_IFW_PATH_VAR}}" STREQUAL "")
+    list(APPEND _CPACK_IFW_PATHS "$ENV{${_CPACK_IFW_PATH_VAR}}")
+  endif()
+endforeach()
 if(WIN32)
   list(APPEND _CPACK_IFW_PATHS
     "$ENV{HOMEDRIVE}/Qt"
@@ -447,22 +451,44 @@ else()
     "$ENV{HOME}/Qt"
     "/opt/Qt")
 endif()
-
-set(_CPACK_IFW_SUFFIXES
-# Common
-  "bin"
-# Second branch
-  "QtIFW2.3.0/bin"
-  "QtIFW2.2.0/bin"
-  "QtIFW2.1.0/bin"
-  "QtIFW2.0.3/bin"
-  "QtIFW2.0.1/bin"
-  "QtIFW2.0.0/bin"
-# First branch
-  "QtIFW-1.6.0/bin"
-  "QtIFW-1.5.0/bin"
-  "QtIFW-1.4.0/bin"
-  "QtIFW-1.3.0/bin")
+list(REMOVE_DUPLICATES _CPACK_IFW_PATHS)
+
+set(_CPACK_IFW_PREFIXES
+  # QtSDK
+  "Tools/QtInstallerFramework/"
+  # Second branch
+  "QtIFW"
+  # First branch
+  "QtIFW-")
+
+set(_CPACK_IFW_VERSIONS
+  "2.3"
+  "2.3.0"
+  "2.2"
+  "2.2.0"
+  "2.1"
+  "2.1.0"
+  "2.0"
+  "2.0.3"
+  "2.0.2"
+  "2.0.1"
+  "2.0.0"
+  "1.6"
+  "1.6.0"
+  "1.5"
+  "1.5.0"
+  "1.4"
+  "1.4.0"
+  "1.3"
+  "1.3.0")
+
+set(_CPACK_IFW_SUFFIXES "bin")
+foreach(_CPACK_IFW_PREFIX ${_CPACK_IFW_PREFIXES})
+  foreach(_CPACK_IFW_VERSION ${_CPACK_IFW_VERSIONS})
+    list(APPEND
+      _CPACK_IFW_SUFFIXES "${_CPACK_IFW_PREFIX}${_CPACK_IFW_VERSION}/bin")
+  endforeach()
+endforeach()
 
 # Look for 'binarycreator'
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake