From 5ab75dd7dd3ef776fee0f7d7fcf2a559b5e415de Mon Sep 17 00:00:00 2001
From: Erlend Egeberg Aasland <erlend.aasland@innova.no>
Date: Thu, 12 Nov 2020 06:10:49 -0500
Subject: CPack/IFW: Locate the archivegen utility

Fixes: #21427
---
 Help/cpack_gen/ifw.rst |  4 ++++
 Modules/CPackIFW.cmake | 10 ++++++++++
 2 files changed, 14 insertions(+)

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
 #
-- 
cgit v0.12