File: use-system-tinyxml

package info (click to toggle)
cppcheck 1.86-1
  • links: PTS
  • area: main
  • in suites: buster
  • size: 14,600 kB
  • sloc: cpp: 169,157; python: 6,329; ansic: 3,848; xml: 847; makefile: 563; sh: 429; cs: 291
file content (52 lines) | stat: -rw-r--r-- 1,921 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
Description: Link cppcheck and cppcheck-gui with the system tinyxml
Author: Joachim Reichel <reichel@debian.org>

diff -u -r cppcheck-1.75/Makefile cppcheck-1.75/Makefile
--- cppcheck-1.75/Makefile	2016-08-06 18:49:40.000000000 +0200
+++ cppcheck-1.75/Makefile	2016-08-28 14:48:17.980341288 +0200
@@ -96,7 +96,7 @@
 ifeq ($(HAVE_RULES),yes)
     override CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell pcre-config --cflags)
     ifdef LIBS
-        LIBS += $(shell pcre-config --libs)
+        override LIBS += $(shell pcre-config --libs)
     else
         LIBS=$(shell pcre-config --libs)
     endif
@@ -175,8 +175,7 @@
               $(SRCDIR)/tokenlist.o \
               $(SRCDIR)/valueflow.o
 
-EXTOBJ =      externals/simplecpp/simplecpp.o \
-              externals/tinyxml/tinyxml2.o
+EXTOBJ =      externals/simplecpp/simplecpp.o
 
 CLIOBJ =      cli/cmdlineparser.o \
               cli/cppcheckexecutor.o \
diff -u -r cppcheck-1.75/externals/externals.pri cppcheck-1.75/externals/externals.pri
--- cppcheck-1.75/externals/externals.pri	2016-08-06 18:49:40.000000000 +0200
+++ cppcheck-1.75/externals/externals.pri	2016-08-28 14:48:17.876341292 +0200
@@ -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
diff -u -r cppcheck-1.75/gui/gui.pro cppcheck-1.75/gui/gui.pro
--- cppcheck-1.75/gui/gui.pro	2016-08-06 18:49:40.000000000 +0200
+++ cppcheck-1.75/gui/gui.pro	2016-08-28 14:48:17.856341292 +0200
@@ -14,7 +14,7 @@
     LIBS += -l../bin/cppcheck-core
     DEFINES += CPPCHECKLIB_IMPORT
 }
-LIBS += -L$$PWD/../externals
+LIBS += -ltinyxml2
 
 DESTDIR = .
 RCC_DIR = temp