decouple peglib from lib utility

This commit is contained in:
Bruno Alexandre Rosa 2026-03-28 13:31:37 -03:00
parent 57f570852f
commit 96b978dd5b
6 changed files with 6 additions and 5 deletions

2
.gitmodules vendored
View file

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

View file

@ -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)

View file

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

View file

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

View file

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