diff options
| author | Konstantin Podsvirov <konstantin@podsvirov.pro> | 2017-04-06 21:34:32 (GMT) |
|---|---|---|
| committer | Konstantin Podsvirov <konstantin@podsvirov.pro> | 2017-04-15 03:52:13 (GMT) |
| commit | d97978b887c087e5c727de514476e6d9b924d61a (patch) | |
| tree | 1882289407121e44f311b371e2e3de449fff0ebe /Modules/CPackIFW.cmake | |
| parent | 286e4f1087fab8adc43a4da361e95dbababaead0 (diff) | |
| download | CMake-d97978b887c087e5c727de514476e6d9b924d61a.zip CMake-d97978b887c087e5c727de514476e6d9b924d61a.tar.gz CMake-d97978b887c087e5c727de514476e6d9b924d61a.tar.bz2 | |
CPackIFW: Improved QtIFW search algorithm
Improvements:
- Added new hint CPACK_IFW_ROOT variable;
- Extend documentation.
Diffstat (limited to 'Modules/CPackIFW.cmake')
| -rw-r--r-- | Modules/CPackIFW.cmake | 48 |
1 files changed, 42 insertions, 6 deletions
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake index deb724c..1e8f4f6 100644 --- a/Modules/CPackIFW.cmake +++ b/Modules/CPackIFW.cmake @@ -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}}") |