| 1 |
commit: 9bac38649bac48278e4e4af90e3f89f78d861ed2 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 16 17:40:28 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 21 16:39:28 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bac3864 |
| 7 |
|
| 8 |
cmake.eclass: Fix MYCMAKEARGS support with >=dev-util/cmake-3.23 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/833100 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/cmake.eclass | 5 ++++- |
| 14 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass |
| 17 |
index 02683634af9f..f34ebef1b764 100644 |
| 18 |
--- a/eclass/cmake.eclass |
| 19 |
+++ b/eclass/cmake.eclass |
| 20 |
@@ -593,9 +593,12 @@ cmake_src_configure() { |
| 21 |
"${mycmakeargs_local[@]}" |
| 22 |
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" |
| 23 |
-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}" |
| 24 |
- "${MYCMAKEARGS}" |
| 25 |
) |
| 26 |
|
| 27 |
+ if [[ -n ${MYCMAKEARGS} ]] ; then |
| 28 |
+ cmakeargs+=( "${MYCMAKEARGS}" ) |
| 29 |
+ fi |
| 30 |
+ |
| 31 |
if [[ -n "${CMAKE_EXTRA_CACHE_FILE}" ]] ; then |
| 32 |
cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" ) |
| 33 |
fi |
Archives