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

CPackIFW: Improved QtIFW search algorithm

Browse Source 
Improvements:
- Added new hint CPACK_IFW_ROOT variable;
- Extend documentation.
This commit is contained in:
Konstantin Podsvirov
2017-04-07 00:34:32 +03:00
parent 286e4f1087
commit d97978b887
2 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

48
Modules/CPackIFW.cmake
View File

@@ -28,8 +28,32 @@
# and Mac OS X. # and Mac OS X.
# #
# You should also install QtIFW_ to use CPack ``IFW`` generator. # 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 # Variables
# ^^^^^^^^^ # ^^^^^^^^^
@@ -197,7 +221,7 @@
# dependent components. # dependent components.
# #
# Tools # Tools
# """""""" # """""
# #
# .. variable:: CPACK_IFW_FRAMEWORK_VERSION # .. variable:: CPACK_IFW_FRAMEWORK_VERSION
# #
@@ -207,13 +231,25 @@
# #
# The path to "binarycreator" command line client. # 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 # .. variable:: CPACK_IFW_REPOGEN_EXECUTABLE
# #
# The path to "repogen" command line client. # 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 # Commands
# ^^^^^^^^^ # ^^^^^^^^^
@@ -568,7 +604,7 @@
# Default path # 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} if(DEFINED ${_CPACK_IFW_PATH_VAR}
AND NOT "${${_CPACK_IFW_PATH_VAR}}" STREQUAL "") AND NOT "${${_CPACK_IFW_PATH_VAR}}" STREQUAL "")
list(APPEND _CPACK_IFW_PATHS "${${_CPACK_IFW_PATH_VAR}}") list(APPEND _CPACK_IFW_PATHS "${${_CPACK_IFW_PATH_VAR}}")