[PATCH 4/6] ecm.eclass: Avoid unused BUILD_QCH CMake warnings

Andreas Sturmlechner <[email protected]> Sat, 06 Jun 2026 00:58:34 +0200
Newsgroups gmane.linux.gentoo.devel
Message-ID <[email protected]>
... especially on PIM packages ported to ECMGenerateQDoc meanwhile.

Signed-off-by: Andreas Sturmlechner <[email protected]>
---
 eclass/ecm.eclass | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index ad042e3545a2..1580322237b3 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -303,6 +303,17 @@ _ecm_handbook_optional() {
 	fi
 }
 
+# @FUNCTION: _ecm_buildqch_optional
+# @DESCRIPTION:
+# Used with ECM_QTHELP; ticks -DBUILD_QCH only if available.
+_ecm_buildqch_optional() {
+	if use doc; then
+		echo "-DBUILD_QCH=ON"
+	elif grep -Eq "option.*BUILD_QCH" CMakeLists.txt; then
+		echo "-DBUILD_QCH=OFF"
+	fi
+}
+
 # @FUNCTION: _ecm_strip_handbook_translations
 # @INTERNAL
 # @DESCRIPTION:
@@ -564,6 +575,10 @@ ecm_src_configure() {
 		cmakeargs+=( $(_ecm_handbook_optional) )
 	fi
 
+	if [[ ${ECM_QTHELP} = true ]]; then
+		cmakeargs+=( $(_ecm_buildqch_optional) )
+	fi
+
 	if in_iuse designer && [[ ${ECM_DESIGNERPLUGIN} = true ]]; then
 		cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) )
 	fi
@@ -572,10 +587,6 @@ ecm_src_configure() {
 		cmakeargs+=( -DBUILD_PYTHON_BINDINGS=OFF )
 	fi
 
-	if [[ ${ECM_QTHELP} = true ]]; then
-		cmakeargs+=( -DBUILD_QCH=$(usex doc) )
-	fi
-
 	# Common ECM configure parameters (invariants)
 	local ecm_config=${BUILD_DIR}/gentoo_ecm_config.cmake
 	cat > ${ecm_config} <<- _EOF_ || die
-- 
2.54.0
signature.asc (application/pgp-signature, 829 B)
-----BEGIN PGP SIGNATURE-----

iQIvBAABCgCZFiEE34gXUSooizdYNDu3S5FW4z0PgBkFAmojVJobFIAAAAAABAAO
bWFudTIsMi41KzEuMTIsMiwyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25z
Lm9wZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRERjg4MTc1MTJBMjg4QjM3NTgzNDNC
Qjc0QjkxNTZFMzNEMEY4MDE5AAoJEEuRVuM9D4AZkaQL/A/Pf06K6qe4wXzWAHAX
ntjkWdwFMzhho7SBTA4UVLdHZWbt/HcT+PPtSHkDbPVSEY2sK4xRkQtU3IqD4j9q
3ix7XYym17WA2OmxdUC6Rzmol7RY0o7hBFmxaCgnaOTgkf2faEMmqEv5PX0CrHhB
Iwn5eTUAHyc5PTCE8Yne6OG4wjdNj8XJyG/4oR9L28bqa9jbJukML7xHUec9o/aF
MIRaibE+lRgDIJi8oFglsgaf25caLfdxg8emB22F4LlpdALUq/r9nKu/s2fc2M7Y
PWp9AcDeY014cDetEIH8v84+4HKxp0pZal8NUf9XNbPd8GbD4SuI39KCsR+wioeb
l1dc5iW0kb3wRIu0LcFdJPnqgVrEtG1cB7xWjz19/ZoiB3SQ3ydtkW1857xhrUJs
vqMGNM98MVvT0TdbcKaZUmwjG8vufLIuI2pdVqLl5hmGJDpm1rGstPU75ayUhYVe
qCW4XvAfLmXN6Wb6TD+z5jxa+kZgDahoi8e7dp8sAAKM0w==
=U6H/
-----END PGP SIGNATURE-----