Merge branch 'development' into pilot-remove-todos

Mudlet · Nov 26, 2022 · c22cc8b · c22cc8b
2 parents 23750f5 + edcd1ae
commit c22cc8b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/build-mudlet.yml b/.github/workflows/build-mudlet.yml
@@ -308,7 +308,7 @@ jobs:
         run-luarocks install --local luautf8
         run-luarocks install --local lua-zip
         run-luarocks install SQLITE_INCDIR="${{env.VCPKG_ROOT}}/installed/${{matrix.triplet}}/include" --local LuaSQL-SQLite3
-        run-luarocks install --local lrexlib-pcre
+        run-luarocks install PCRE_INCDIR="${{env.VCPKG_ROOT}}/installed/${{matrix.triplet}}/include" --local lrexlib-pcre
 
         # CI changelog generation dependencies
         run-luarocks install --local argparse

diff --git a/3rdparty/our-vcpkg-dependencies/vcpkg-x64-linux-dependencies b/3rdparty/our-vcpkg-dependencies/vcpkg-x64-linux-dependencies
@@ -6,3 +6,5 @@ pugixml
 --overlay-ports=../our-vcpkg-dependencies/lua
 lua[core]
 sqlite3
+pcre
+
diff --git a/3rdparty/our-vcpkg-dependencies/vcpkg-x64-osx-dependencies b/3rdparty/our-vcpkg-dependencies/vcpkg-x64-osx-dependencies
@@ -6,3 +6,4 @@ pugixml
 --overlay-ports=../our-vcpkg-dependencies/lua
 lua[core]
 sqlite3
+pcre