From a5ba16934e157aa49e248958c55292774871472b Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 13 Oct 2025 23:07:55 +0200 Subject: 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 --- eclass/cmake.eclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'eclass') diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 01954d972fb..77ba1ccfac1 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 -- cgit v1.2.3