[patch] cppcheck-1.90-tinyxml2.patch

cppcheck-1.90-tinyxml2.patch (text/plain), 4.30 KB, created by Gabriel Marcano on 2020-02-27 06:42:03 UTC

diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
index 81cf65422..26f9da922 100644
--- a/oss-fuzz/Makefile
+++ b/oss-fuzz/Makefile
@@ -6,8 +6,8 @@
 # make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" fuzz-client
 
 CPPCHECK_DIR=..
-INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals/tinyxml -I ${CPPCHECK_DIR}/externals
-SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/externals/tinyxml/tinyxml2.cpp ${CPPCHECK_DIR}/lib/*.cpp
+INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals
+SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/lib/*.cpp
 
 all:	oss-fuzz-client	translate
 
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index d16a3caa4..092bc343c 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -57,8 +57,7 @@ static std::string objfiles(const std::vector<std::string> &files)
 static void getDeps(const std::string &filename, std::vector<std::string> &depfiles)
 {
     static const std::vector<std::string> externalfolders = {"externals",
-                                                             "externals/simplecpp",
-                                                             "externals/tinyxml"
+                                                             "externals/simplecpp"
                                                             };
 
     // Is the dependency already included?
@@ -383,9 +382,9 @@ int main(int argc, char **argv)
          << "endif\n\n";
 
     makeConditionalVariable(fout, "PREFIX", "/usr");
-    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp -isystem externals/tinyxml");
-    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp -isystem externals/tinyxml");
-    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp -isystem externals/tinyxml");
+    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp");
+    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp");
+    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp");
 
     fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
@@ -417,7 +416,7 @@ int main(int argc, char **argv)
     fout << "run-dmake: dmake\n";
     fout << "\t./dmake\n\n";
     fout << "generate_cfg_tests: tools/generate_cfg_tests.o $(EXTOBJ)\n";
-    fout << "\tg++ -isystem externals/tinyxml -o generate_cfg_tests tools/generate_cfg_tests.o $(EXTOBJ)\n";
+    fout << "\tg++ -o generate_cfg_tests tools/generate_cfg_tests.o $(EXTOBJ)\n";
     fout << "clean:\n";
     fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/*/*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1\n\n";
     fout << "man:\tman/cppcheck.1\n\n";
diff --git a/externals/externals.pri b/externals/externals.pri
index 7f0be8de3..b1e94e078 100644
--- a/externals/externals.pri
+++ b/externals/externals.pri
@@ -1,9 +1,6 @@
 INCLUDEPATH += $${PWD} \
-               $${PWD}/simplecpp \
-               $${PWD}/tinyxml
+               $${PWD}/simplecpp
 
-HEADERS += $${PWD}/simplecpp/simplecpp.h \
-           $${PWD}/tinyxml/tinyxml2.h
+HEADERS += $${PWD}/simplecpp/simplecpp.h
 
-SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
-           $${PWD}/tinyxml/tinyxml2.cpp
+SOURCES += $${PWD}/simplecpp/simplecpp.cpp
diff --git a/gui/gui.pro b/gui/gui.pro
index 7275ec285..464e6c0da 100644
--- a/gui/gui.pro
+++ b/gui/gui.pro
@@ -15,6 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
     DEFINES += CPPCHECKLIB_IMPORT
 }
 LIBS += -L$$PWD/../externals
+LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2)
 
 DESTDIR = .
 RCC_DIR = temp
diff --git a/gui/test/xmlreportv2/xmlreportv2.pro b/gui/test/xmlreportv2/xmlreportv2.pro
index 26851a356..bb9fab084 100644
--- a/gui/test/xmlreportv2/xmlreportv2.pro
+++ b/gui/test/xmlreportv2/xmlreportv2.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = test-xmlreportv2
 DEPENDPATH += .
-INCLUDEPATH += . ../../../externals/simplecpp ../../../externals/tinyxml
+INCLUDEPATH += . ../../../externals/simplecpp
 OBJECTS_DIR = ../build
 MOC_DIR = ../build