From: Ross Burton <ross.burton@arm.com>
Date: Mon, 16 Feb 2026 13:48:31 +0000 (+0000)
Subject: cmake: clean up variables shared between .bb and .inc
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d996cafdc4c9ddc02c51c59658d843a472f0d46;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

cmake: clean up variables shared between .bb and .inc

Use EXTRA_OECMAKE in the non-cmake-inheriting cmake-native recipe, so
that the cmake.inc can assign once.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb b/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
index 128fef8a6e..299cb4d1ea 100644
--- a/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
@@ -22,7 +22,7 @@ LIC_FILES_CHKSUM:append = " \
 B = "${WORKDIR}/build"
 do_configure[cleandirs] = "${B}"
 
-CMAKE_EXTRACONF = "\
+EXTRA_OECMAKE += "\
     -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \
     -DBUILD_CursesDialog=1 \
     -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
@@ -41,7 +41,7 @@ do_configure () {
 	${S}/bootstrap --verbose --prefix=${prefix} \
 		${@oe.utils.parallel_make_argument(d, '--parallel=%d')} \
 		${@bb.utils.contains('CCACHE', 'ccache ', '--enable-ccache', '', d)} \
-		-- ${CMAKE_EXTRACONF}
+		-- ${EXTRA_OECMAKE}
 }
 
 do_compile() {
diff --git a/meta/recipes-devtools/cmake/cmake_4.2.3.bb b/meta/recipes-devtools/cmake/cmake_4.2.3.bb
index 7c3dda2b15..233ceeae15 100644
--- a/meta/recipes-devtools/cmake/cmake_4.2.3.bb
+++ b/meta/recipes-devtools/cmake/cmake_4.2.3.bb
@@ -33,7 +33,7 @@ python () {
     d.setVar("docdir_stripped", docdir_stripped)
 }
 
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE += " \
     -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
     -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \