[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a5ba16934e157aa49e248958c55292774871472b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 13 21:07:55 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 14 22:01:14 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a5ba1693

cmake.eclass: No -DCMAKE_POLICY_VERSION_MINIMUM=3.5 w/ CMAKE_QA_COMPAT_SKIP

If QA checks are skipped, then it is counterproductive to hide
resulting errors.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 01954d972f..77ba1ccfac 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -301,7 +301,7 @@ _cmake_minreqver-info() {
                        eqawarn "  ${info}"
                done
                eqawarn
-               if has_version -b ">=dev-build/cmake-4"; then
+               if ! [[ ${CMAKE_QA_COMPAT_SKIP} ]] && has_version -b 
">=dev-build/cmake-4"; then
                        eqawarn "CMake 4 detected; building with 
-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
                        eqawarn "This is merely a workaround to avoid CMake 
Error and *not* a permanent fix;"
                        eqawarn "there may be new build or runtime bugs as a 
result."
@@ -663,7 +663,9 @@ cmake_src_configure() {
                cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
        fi
 
-       if [[ -n ${_CMAKE_MINREQVER_CMAKE305[@]} ]] && has_version -b 
">=dev-build/cmake-4"; then
+       if ! [[ ${CMAKE_QA_COMPAT_SKIP} ]] &&
+               [[ -n ${_CMAKE_MINREQVER_CMAKE305[@]} ]] &&
+               has_version -b ">=dev-build/cmake-4"; then
                cmakeargs+=( -DCMAKE_POLICY_VERSION_MINIMUM=3.5 )
        fi