Merge 5545be0a17 into b1fe4c85d3

.github/workflows/desktop-build.yml

@@ -170,6 +170,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Checkout thirdparty submodules
+        run: |
+          git submodule init thirdparty
+          git submodule update thirdparty
+
       - name: Restore compiler cache (ccache)
         id: ccache_restore
         uses: actions/cache/restore@v5

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "doxygen-awesome-css"]
 	path = doc/doxygen/theme
 	url = https://github.com/jothepro/doxygen-awesome-css.git
+[submodule "cpp-peglib"]
+	path = thirdparty/cpp-peglib
+	url = https://github.com/yhirose/cpp-peglib

CMakeLists.txt

@@ -232,6 +232,8 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0" AND NOT EXISTS "${Protobuf_PROTOC
   message(FATAL_ERROR "No protoc command found!")
 endif()
 
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cpp-peglib)
+
 #Find OpenSSL
 if(WIN32)
   find_package(OpenSSL REQUIRED)

cockatrice/src/filters/deck_filter_string.cpp

@@ -3,7 +3,7 @@
 #include <QFileInfo>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
-#include <libcockatrice/utility/peglib.h>
+#include <peglib.h>
 
 static peg::parser search(R"(
 Start <- QueryPartList

libcockatrice_filters/libcockatrice/filters/filter_string.cpp

@@ -5,7 +5,7 @@
 #include <QRegularExpression>
 #include <QString>
 #include <functional>
-#include <libcockatrice/utility/peglib.h>
+#include <peglib.h>
 
 static peg::parser search(R"(
 Start <- QueryPartList

libcockatrice_utility/libcockatrice/utility/expression.cpp

@@ -1,11 +1,10 @@
 #include "expression.h"
 
-#include "peglib.h"
-
 #include <QByteArray>
 #include <QString>
 #include <QtMath>
 #include <functional>
+#include <peglib.h>
 
 peg::parser math(R"(
     EXPRESSION   <-  P0

thirdparty/cpp-peglib

@@ -0,0 +1 @@
+Subproject commit dcabc63cf4b966eb6f33abd571ae4cda6bf707f0