aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-02-16 18:40:28 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2022-02-16 18:40:28 +0100
commit04185da129d212b2e92ce5975abfae03b006d7d4 (patch)
tree2501081443f884e635a3e9a1b2716f9542a9a39b /eclass/cmake.eclass
parentkde-frameworks/kguiaddons: Set ECM_NONGUI=false (diff)
downloadkde-04185da129d212b2e92ce5975abfae03b006d7d4.tar.gz
kde-04185da129d212b2e92ce5975abfae03b006d7d4.tar.bz2
kde-04185da129d212b2e92ce5975abfae03b006d7d4.zip
cmake.eclass: Fix MYCMAKEARGS support with >=dev-util/cmake-3.23
Bug: https://bugs.gentoo.org/833100 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass/cmake.eclass')
-rw-r--r--eclass/cmake.eclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 36f2621e19..64a2931898 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -593,9 +593,12 @@ cmake_src_configure() {
"${mycmakeargs_local[@]}"
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
- "${MYCMAKEARGS}"
)
+ if [[ -n ${MYCMAKEARGS} ]] ; then
+ cmakeargs+=( "${MYCMAKEARGS}" )
+ fi
+
if [[ -n "${CMAKE_EXTRA_CACHE_FILE}" ]] ; then
cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
fi