mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-04-27 07:48:01 -07:00
decouple peglib from lib utility
This commit is contained in:
parent
57f570852f
commit
96b978dd5b
6 changed files with 6 additions and 5 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue