[LyX/master] lyxbuild --patch-old: cherry-pick a fix for cmake

commit c9c4d9ed92b433f96bbb3bd9c03051771500a6c0
Author: Scott Kostyshak <[email protected]>
Date:   Wed Jul 1 14:57:06 2026 +0200

    lyxbuild --patch-old: cherry-pick a fix for cmake
---
 development/lyx-tester/lyxbuild | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/development/lyx-tester/lyxbuild b/development/lyx-tester/lyxbuild
index ef0e9586f8..7a2dccf28f 100755
--- a/development/lyx-tester/lyxbuild
+++ b/development/lyx-tester/lyxbuild
@@ -398,9 +398,26 @@ if [ "${patch_old}" = "1" ]; then
     git cherry-pick -x --keep-redundant-commits 7b44280da4fc015a4a930c311cc6073cebacf738
   fi
 
+  # I'm not sure why, but without this commit, i get the following error:
+  #lyxbuild: creating "CMakeBuild" dir, user-dir, and running cmake...
+  #CMake Error at development/autotests/ExportTests.cmake:56 (foreach):
+  #  Unknown argument:
+  #
+  #    \family default
+  #
+  #Call Stack (most recent call first):
+  #  development/autotests/ExportTests.cmake:397 (getoutputformats)
+  #  development/autotests/CMakeLists.txt:125 (include)
+  #
+  #
+  #lyxbuild: ERROR: running cmake
+  #
+  if ! git merge-base --is-ancestor "4bd4bfb3" HEAD; then
+    git cherry-pick -x --keep-redundant-commits --strategy=recursive -X theirs "4bd4bfb3"
+  fi
 
   if ! git merge-base --is-ancestor "51cc8aa9" HEAD; then
-    git cherry-pick -x --keep-redundant-commits --strategy=recursive -X theirs 51cc8aa9
+    git cherry-pick -x --keep-redundant-commits --strategy=recursive -X theirs "51cc8aa9"
   fi
   if ! git merge-base --is-ancestor "1a440494" HEAD; then
     git cherry-pick -x --keep-redundant-commits 1a440494
-- 
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs