walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Removed -DTIXML_USE_STL flag (#5624) 

Updated version of https://github.com/danmar/cppcheck/pull/5145
This commit is contained in:
orbitcowboy 2023-11-05 15:54:22 +01:00 committed by GitHub
parent 0dc53ac7fe
commit 966a89d5f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -155,7 +155,7 @@ ifeq ($(HAVE_RULES),yes)
ifeq ($(PCRE_CONFIG),) ifeq ($(PCRE_CONFIG),)
$(error Did not find pcre-config) $(error Did not find pcre-config)
endif endif
override CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell $(PCRE_CONFIG) --cflags) override CXXFLAGS += -DHAVE_RULES $(shell $(PCRE_CONFIG) --cflags)
ifdef LIBS ifdef LIBS
LIBS += $(shell $(PCRE_CONFIG) --libs) LIBS += $(shell $(PCRE_CONFIG) --libs)
else else

2
cmake/compilerDefinitions.cmake
View File

@ -22,7 +22,7 @@ if (CPPCHK_GLIBCXX_DEBUG AND UNIX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
endif() endif()
if (HAVE_RULES) if (HAVE_RULES)
add_definitions(-DHAVE_RULES -DTIXML_USE_STL) add_definitions(-DHAVE_RULES)
endif() endif()
if (Boost_FOUND) if (Boost_FOUND)

2
tools/dmake.cpp
View File

@ -630,7 +630,7 @@ int main(int argc, char **argv)
<< " ifeq ($(PCRE_CONFIG),)\n" << " ifeq ($(PCRE_CONFIG),)\n"
<< " $(error Did not find pcre-config)\n" << " $(error Did not find pcre-config)\n"
<< " endif\n" << " endif\n"
<< " override CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell $(PCRE_CONFIG) --cflags)\n" << " override CXXFLAGS += -DHAVE_RULES $(shell $(PCRE_CONFIG) --cflags)\n"
<< " ifdef LIBS\n" << " ifdef LIBS\n"
<< " LIBS += $(shell $(PCRE_CONFIG) --libs)\n" << " LIBS += $(shell $(PCRE_CONFIG) --libs)\n"
<< " else\n" << " else\n"