From 45bcf8386918bbb475fbe20c48b508aa89ed0624 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Thu, 20 Apr 2023 13:19:38 +0200
Subject: refactor(build): include lpeg as a library

---
 cmake.deps/cmake/BuildLpeg.cmake | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 cmake.deps/cmake/BuildLpeg.cmake

(limited to 'cmake.deps/cmake/BuildLpeg.cmake')

diff --git a/cmake.deps/cmake/BuildLpeg.cmake b/cmake.deps/cmake/BuildLpeg.cmake
new file mode 100644
index 0000000000..81efccf1f4
--- /dev/null
+++ b/cmake.deps/cmake/BuildLpeg.cmake
@@ -0,0 +1,18 @@
+list(APPEND LPEG_CMAKE_ARGS "-DCMAKE_C_FLAGS:STRING=${DEPS_INCLUDE_FLAGS}")
+
+ExternalProject_Add(lpeg
+  URL ${LPEG_URL}
+  URL_HASH SHA256=${LPEG_SHA256}
+  DOWNLOAD_NO_PROGRESS TRUE
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lpeg
+  PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LpegCMakeLists.txt
+    ${DEPS_BUILD_DIR}/src/lpeg/CMakeLists.txt
+  CMAKE_ARGS ${DEPS_CMAKE_ARGS} ${LPEG_CMAKE_ARGS}
+  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
+
+if(USE_BUNDLED_LUAJIT)
+  add_dependencies(lpeg luajit)
+elseif(USE_BUNDLED_LUA)
+  add_dependencies(lpeg lua)
+endif()
-- 
cgit 


From 1bf29a0ae1fffee8a009dfbc8da2d7c048f6eb20 Mon Sep 17 00:00:00 2001
From: Enan Ajmain <3nan.ajmain@gmail.com>
Date: Sun, 7 May 2023 04:47:45 +0600
Subject: build: add system lua include dir for lpeg

Problem: Lpeg requires Lua headers.  Currently the include directories
for Lpeg are set only to the bundled deps folder, so if the user wants
to use system Lua/Luajit, Lpeg will not find the system headers and will
fail to build.

Solution: Add system Lua/Luajit include directories when USE_BUNDLED_LUA
and USE_BUNDLED_LUAJIT are turned off.

Fixes #23469
---
 cmake.deps/cmake/BuildLpeg.cmake | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'cmake.deps/cmake/BuildLpeg.cmake')

diff --git a/cmake.deps/cmake/BuildLpeg.cmake b/cmake.deps/cmake/BuildLpeg.cmake
index 81efccf1f4..bbdc83d94d 100644
--- a/cmake.deps/cmake/BuildLpeg.cmake
+++ b/cmake.deps/cmake/BuildLpeg.cmake
@@ -1,4 +1,18 @@
-list(APPEND LPEG_CMAKE_ARGS "-DCMAKE_C_FLAGS:STRING=${DEPS_INCLUDE_FLAGS}")
+set(LPEG_INCLUDE_FLAGS ${DEPS_INCLUDE_FLAGS})
+
+if(NOT USE_BUNDLED_LUAJIT AND NOT USE_BUNDLED_LUA)
+  find_package(Luajit)
+  if(LUAJIT_FOUND)
+    string(CONCAT LPEG_INCLUDE_FLAGS ${DEPS_INCLUDE_FLAGS} " -I${LUAJIT_INCLUDE_DIR}")
+  else()
+    find_package(Lua 5.1 EXACT)
+    if(LUA_FOUND)
+      string(CONCAT LPEG_INCLUDE_FLAGS ${DEPS_INCLUDE_FLAGS} " -I${LUA_INCLUDE_DIR}")
+    endif()
+  endif()
+endif()
+
+list(APPEND LPEG_CMAKE_ARGS -DCMAKE_C_FLAGS=${LPEG_INCLUDE_FLAGS})
 
 ExternalProject_Add(lpeg
   URL ${LPEG_URL}
-- 
cgit 


From 99b8a343e197cdec53f752e1cce01ae25eb45c12 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Mon, 20 Nov 2023 12:42:54 +0100
Subject: fixup: quick update, squash later

---
 cmake.deps/cmake/BuildLpeg.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cmake.deps/cmake/BuildLpeg.cmake')

diff --git a/cmake.deps/cmake/BuildLpeg.cmake b/cmake.deps/cmake/BuildLpeg.cmake
index bbdc83d94d..bba23fe42b 100644
--- a/cmake.deps/cmake/BuildLpeg.cmake
+++ b/cmake.deps/cmake/BuildLpeg.cmake
@@ -17,13 +17,13 @@ list(APPEND LPEG_CMAKE_ARGS -DCMAKE_C_FLAGS=${LPEG_INCLUDE_FLAGS})
 ExternalProject_Add(lpeg
   URL ${LPEG_URL}
   URL_HASH SHA256=${LPEG_SHA256}
-  DOWNLOAD_NO_PROGRESS TRUE
   DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lpeg
   PATCH_COMMAND ${CMAKE_COMMAND} -E copy
     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LpegCMakeLists.txt
     ${DEPS_BUILD_DIR}/src/lpeg/CMakeLists.txt
   CMAKE_ARGS ${DEPS_CMAKE_ARGS} ${LPEG_CMAKE_ARGS}
-  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
+  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}
+  ${EXTERNALPROJECT_OPTIONS})
 
 if(USE_BUNDLED_LUAJIT)
   add_dependencies(lpeg luajit)
-- 
cgit