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 efb416046626b3c9332dde3a2e20ace755d58b9a (commit) via 47392375887e09e6e69ce178f870f9ca9e639298 (commit) from d44f19273550c193ef643db5fc9ac6aff13ce85b (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=efb416046626b3c9332dde3a2e20ace755d58b9a commit efb416046626b3c9332dde3a2e20ace755d58b9a Merge: d44f192 4739237 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Nov 3 08:14:23 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Nov 3 08:14:23 2016 -0400 Merge topic 'cpackifw-search-algorithm' into next 47392375 CPackIFW: Updated search algorithm https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47392375887e09e6e69ce178f870f9ca9e639298 commit 47392375887e09e6e69ce178f870f9ca9e639298 Author: Konstantin Podsvirov <konstan...@podsvirov.pro> AuthorDate: Wed Nov 2 23:15:07 2016 +0300 Commit: Konstantin Podsvirov <konstan...@podsvirov.pro> CommitDate: Wed Nov 2 23:15:07 2016 +0300 CPackIFW: Updated search algorithm Improviments: - Look for QtIFW distributed with QtSDK; - Do not give a reason for the CMP0007 warning. 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: Modules/CPackIFW.cmake | 68 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 21 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits