diff options
| author |   Michael Weber <xmw@gentoo.org> | 2016-08-04 15:08:54 +0200 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2016-08-04 15:09:10 +0200 |
| commit | 9a345b0cdd668ad0678f49a306665354b6c3143c (patch) | |
| tree | 4ee934f6cd3cc73c82c5889f2909d8ff3d875801 /dev-util/cppcheck/files | |
| parent | sci-electronics/gazebo: fix build with tinyxml2 4.0 (diff) | |
| download | gentoo-9a345b0cdd668ad0678f49a306665354b6c3143c.tar.gz gentoo-9a345b0cdd668ad0678f49a306665354b6c3143c.tar.bz2 gentoo-9a345b0cdd668ad0678f49a306665354b6c3143c.zip | |
dev-util/cppcheck: add live version (bug 590428).
Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-util/cppcheck/files')
| -rw-r--r-- | dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch new file mode 100644 index 000000000000..9d8558466595 --- /dev/null +++ b/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch @@ -0,0 +1,55 @@ +--- cppcheck-9999/gui/gui.pro ++++ cppcheck-9999/gui/gui.pro +@@ -19,6 +19,7 @@ + DEFINES += CPPCHECKLIB_IMPORT + } + LIBS += -L$$PWD/../externals ++LIBS += `pkg-config --libs tinyxml2` + + DESTDIR = . + RCC_DIR = temp +--- cppcheck-9999/tools/dmake.cpp ++++ cppcheck-9999/tools/dmake.cpp +@@ -123,7 +123,6 @@ + + std::vector<std::string> extfiles; + extfiles.push_back("externals/simplecpp/simplecpp.cpp"); +- extfiles.push_back("externals/tinyxml/tinyxml2.cpp"); + + std::vector<std::string> clifiles; + getCppFiles(clifiles, "cli/", false); +@@ -172,7 +171,6 @@ + std::ofstream fout1("test/testfiles.pri"); + if (fout1.is_open()) { + fout1 << "# no manual edits - this file is autogenerated by dmake\n\n"; +- fout1 << "INCLUDEPATH += ../externals/tinyxml\n"; + fout1 << "\n\nSOURCES += "; + for (unsigned int i = 0; i < testfiles.size(); ++i) { + const std::string filename(testfiles[i].substr(5)); +@@ -337,9 +335,9 @@ + << "endif\n\n"; + + makeConditionalVariable(fout, "PREFIX", "/usr"); +- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/simplecpp -Iexternals/tinyxml"); +- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/simplecpp -Iexternals/tinyxml"); +- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/simplecpp -Iexternals/tinyxml"); ++ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/simplecpp"); ++ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/simplecpp"); ++ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/simplecpp"); + + fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n"; + fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n"; +--- cppcheck-9999/externals/externals.pri ++++ cppcheck-9999/externals/externals.pri +@@ -1,8 +1,5 @@ +-INCLUDEPATH += $${PWD}/simplecpp \
+- $${PWD}/tinyxml
++INCLUDEPATH += $${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
|