Skip to content

fixed PCRE usage #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elfprince13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixed PCRE usage #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@

#include "COLLADABUPrerequisites.h"

struct real_pcre;
typedef struct real_pcre pcre;
#include <pcre.h>


namespace COLLADABU
Expand Down
2 changes: 0 additions & 2 deletions COLLADABaseUtils/src/COLLADABUPcreCompiledPattern.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
#include "COLLADABUStableHeaders.h"
#include "COLLADABUPcreCompiledPattern.h"

#include "pcre.h"

namespace COLLADABU
{

Expand Down
1 change: 0 additions & 1 deletion COLLADABaseUtils/src/COLLADABUURI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "COLLADABUHashFunctions.h"

#include <algorithm>
#include "pcre.h"

namespace COLLADABU
{
Expand Down
2 changes: 2 additions & 0 deletions COLLADAFramework/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,14 @@ set(SRC
set(TARGET_LIBS
OpenCOLLADABaseUtils
MathMLSolver
${PCRE_LIBRARIES}
)

include_directories(
${libFramework_include_dirs}
${libBaseUtils_include_dirs}
${libMathMLSolver_include_dirs}
${PCRE_INCLUDE_DIR}
)
opencollada_add_lib(${name} "${SRC}" "${TARGET_LIBS}")

Expand Down