mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 14:20:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cpackifw-search-algorithm'

Browse Source 
049be8b9 CPackIFW: Added new QtIFW versions for search
d97978b8 CPackIFW: Improved QtIFW search algorithm

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !674
This commit is contained in:
Brad King
2017-04-18 12:54:00 +00:00
committed by Kitware Robot
parent 59ffd81f17 049be8b95f
commit eedcaf44bc
2 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Help/release/dev/cpackifw-search-algorithm.rst Normal file
View File

@@ -0,0 +1,7 @@
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.

53
Modules/CPackIFW.cmake
View File

@@ -28,8 +28,32 @@
# and Mac OS X.
#
# You should also install QtIFW_ to use CPack ``IFW`` generator.
# If you don't use a default path for the installation, please set
# the used path in the variable ``QTIFWDIR``.
#
# Hints
# ^^^^^
#
# Generally, the CPack ``IFW`` generator automatically finds QtIFW_ tools,
# but if you don't use a default path for installation of the QtIFW_ tools,
# the path may be specified in either a CMake or an environment variable:
#
# .. variable:: CPACK_IFW_ROOT
#
# An CMake variable which specifies the location of the QtIFW_ tool suite.
#
# The variable will be cached in the ``CPackConfig.cmake`` file and used at
# CPack runtime.
#
# .. variable:: QTIFWDIR
#
# An environment variable which specifies the location of the QtIFW_ tool
# suite.
#
# .. note::
# The specified path should not contain "bin" at the end
# (for example: "D:\\DevTools\\QtIFW2.0.5").
#
# The :variable:`CPACK_IFW_ROOT` variable has a higher priority and overrides
# the value of the :variable:`QTIFWDIR` variable.
#
# Variables
# ^^^^^^^^^
@@ -197,7 +221,7 @@
# dependent components.
#
# Tools
# """"""""
# """""
#
# .. variable:: CPACK_IFW_FRAMEWORK_VERSION
#
@@ -207,13 +231,25 @@
#
# The path to "binarycreator" command line client.
#
# This variable is cached and can be configured user if need.
# This variable is cached and may be configured if needed.
#
# .. variable:: CPACK_IFW_REPOGEN_EXECUTABLE
#
# The path to "repogen" command line client.
#
# This variable is cached and can be configured user if need.
# This variable is cached and may be configured if needed.
#
# .. variable:: CPACK_IFW_INSTALLERBASE_EXECUTABLE
#
# The path to "installerbase" installer executable base.
#
# This variable is cached and may be configured if needed.
#
# .. variable:: CPACK_IFW_DEVTOOL_EXECUTABLE
#
# The path to "devtool" command line client.
#
# This variable is cached and may be configured if needed.
#
# Commands
# ^^^^^^^^^
@@ -568,7 +604,7 @@
# Default path
foreach(_CPACK_IFW_PATH_VAR "QTIFWDIR" "QTDIR")
foreach(_CPACK_IFW_PATH_VAR "CPACK_IFW_ROOT" "QTIFWDIR" "QTDIR")
if(DEFINED ${_CPACK_IFW_PATH_VAR}
AND NOT "${${_CPACK_IFW_PATH_VAR}}" STREQUAL "")
list(APPEND _CPACK_IFW_PATHS "${${_CPACK_IFW_PATH_VAR}}")
@@ -597,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"
@@ -604,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"