Commit d97978b8 authored by Konstantin Podsvirov's avatar Konstantin Podsvirov
Browse files

CPackIFW: Improved QtIFW search algorithm

Improvements:
- Added new hint CPACK_IFW_ROOT variable;
- Extend documentation.
parent 286e4f10
Pipeline #54953 passed with stage
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.
......@@ -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}}")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment