summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlend Egeberg Aasland <erlend.aasland@innova.no>2020-11-12 11:10:49 (GMT)
committerErlend E. Aasland <erlend.aasland@innova.no>2020-11-12 20:22:53 (GMT)
commit5ab75dd7dd3ef776fee0f7d7fcf2a559b5e415de (patch)
treed2b92b4b655990aecb879080b9ff564c8bb63b8c
parente23f9d8a023e3657f974d6d4612437ccbc98c7c7 (diff)
downloadCMake-5ab75dd7dd3ef776fee0f7d7fcf2a559b5e415de.zip
CMake-5ab75dd7dd3ef776fee0f7d7fcf2a559b5e415de.tar.gz
CMake-5ab75dd7dd3ef776fee0f7d7fcf2a559b5e415de.tar.bz2
CPack/IFW: Locate the archivegen utility
Fixes: #21427
-rw-r--r--Help/cpack_gen/ifw.rst4
-rw-r--r--Modules/CPackIFW.cmake10
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 58e6a37..5d5c235 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -436,6 +436,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
#