diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-13 14:43:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-13 14:45:32 (GMT) |
| commit | c35c4ae85c068eec0642e3f211daf2e3615fbfcf (patch) | |
| tree | 35c61c2d41b4613dd7028b6e7336028efdd6294a | |
| parent | 140e06e34462c3c7194945d5b61653bc45b98be2 (diff) | |
| parent | 5ab75dd7dd3ef776fee0f7d7fcf2a559b5e415de (diff) | |
| download | CMake-c35c4ae85c068eec0642e3f211daf2e3615fbfcf.zip CMake-c35c4ae85c068eec0642e3f211daf2e3615fbfcf.tar.gz CMake-c35c4ae85c068eec0642e3f211daf2e3615fbfcf.tar.bz2 | |
Merge topic 'qtifw-archivegen' into release-3.19
5ab75dd7dd CPack/IFW: Locate the archivegen utility
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5503
| -rw-r--r-- | Help/cpack_gen/ifw.rst | 4 | ||||
| -rw-r--r-- | Modules/CPackIFW.cmake | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/Help/cpack_gen/ifw.rst b/Help/cpack_gen/ifw.rst index 776bb46..5fbbfa2 100644 --- a/Help/cpack_gen/ifw.rst +++ b/Help/cpack_gen/ifw.rst @@ -231,6 +231,10 @@ The following variables provide the locations of the QtIFW command-line tools as discovered by the module :module:`CPackIFW`. These variables are cached, and may be configured if needed. +.. variable:: CPACK_IFW_ARCHIVEGEN_EXECUTABLE + + The path to ``archivegen``. + .. variable:: CPACK_IFW_BINARYCREATOR_EXECUTABLE The path to ``binarycreator``. diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake index 0c264e4..6ce0bfc 100644 --- a/Modules/CPackIFW.cmake +++ b/Modules/CPackIFW.cmake @@ -437,6 +437,16 @@ find_program(CPACK_IFW_DEVTOOL_EXECUTABLE ) mark_as_advanced(CPACK_IFW_DEVTOOL_EXECUTABLE) +# Look for 'archivegen' + +find_program(CPACK_IFW_ARCHIVEGEN_EXECUTABLE + NAMES archivegen + PATHS ${_CPACK_IFW_PATHS} + PATH_SUFFIXES ${_CPACK_IFW_SUFFIXES} + DOC "QtIFW archivegen command line client" + ) +mark_as_advanced(CPACK_IFW_ARCHIVEGEN_EXECUTABLE) + # ## Next code is included only once # |