Description: Link cppcheck, cppcheck-gui, and testrunner with the system tinyxml
Author: Joachim Reichel <reichel@debian.org>

Index: cppcheck-1.90/CMakeLists.txt
===================================================================
--- cppcheck-1.90.orig/CMakeLists.txt
+++ cppcheck-1.90/CMakeLists.txt
@@ -21,7 +21,6 @@ if (BUILD_TESTS)
     enable_testing()
 endif()
 
-add_subdirectory(externals/tinyxml)
 add_subdirectory(externals/simplecpp)
 add_subdirectory(lib)   # CppCheck Library 
 add_subdirectory(cli)   # Client application
Index: cppcheck-1.90/cli/CMakeLists.txt
===================================================================
--- cppcheck-1.90.orig/cli/CMakeLists.txt
+++ cppcheck-1.90/cli/CMakeLists.txt
@@ -1,5 +1,4 @@
 include_directories(${PROJECT_SOURCE_DIR}/lib/)
-include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/)
 include_directories(${PROJECT_SOURCE_DIR}/externals/simplecpp/)
 
 file(GLOB hdrs "*.h")
@@ -8,7 +7,8 @@ file(GLOB mainfile "main.cpp")
 list(REMOVE_ITEM srcs ${mainfile})
 
 add_library(cli_objs OBJECT ${hdrs} ${srcs}) 
-add_executable(cppcheck ${hdrs} ${mainfile} $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:tinyxml_objs> $<TARGET_OBJECTS:simplecpp_objs>)
+add_executable(cppcheck ${hdrs} ${mainfile} $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:simplecpp_objs>)
+target_link_libraries(cppcheck tinyxml2)
 if (HAVE_RULES)
     find_library(PCRE_LIBRARY pcre)
     target_link_libraries(cppcheck ${PCRE_LIBRARY})
Index: cppcheck-1.90/gui/CMakeLists.txt
===================================================================
--- cppcheck-1.90.orig/gui/CMakeLists.txt
+++ cppcheck-1.90/gui/CMakeLists.txt
@@ -10,7 +10,6 @@ if (BUILD_GUI)
     endif()
 
     include_directories(${PROJECT_SOURCE_DIR}/lib/)
-    include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/)
 
     file(GLOB hdrs "*.h")
     file(GLOB srcs "*.cpp")
@@ -20,7 +19,8 @@ if (BUILD_GUI)
     QT5_ADD_RESOURCES(resources "gui.qrc")
     QT5_ADD_TRANSLATION(qms ${tss})
 
-    add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:tinyxml_objs> $<TARGET_OBJECTS:simplecpp_objs>)
+    add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:simplecpp_objs>)
+    target_link_libraries(cppcheck-gui tinyxml2)
     if (HAVE_RULES)
         target_link_libraries(cppcheck-gui pcre)
     endif()
Index: cppcheck-1.90/test/CMakeLists.txt
===================================================================
--- cppcheck-1.90.orig/test/CMakeLists.txt
+++ cppcheck-1.90/test/CMakeLists.txt
@@ -12,13 +12,13 @@ if (BUILD_TESTS)
     add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -j ${CTEST_PARALLEL_LEVEL} -C ${CMAKE_CFG_INTDIR} --timeout 90)
 
     include_directories(${PROJECT_SOURCE_DIR}/lib/ ${PROJECT_SOURCE_DIR}/cli/)
-    include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml)
     include_directories(${PROJECT_SOURCE_DIR}/externals/simplecpp/)
 
     file(GLOB hdrs "*.h")
     file(GLOB srcs "*.cpp")
 
-    add_executable(testrunner ${hdrs} ${srcs} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:tinyxml_objs> $<TARGET_OBJECTS:simplecpp_objs>)
+    add_executable(testrunner ${hdrs} ${srcs} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:simplecpp_objs>)
+    target_link_libraries(testrunner tinyxml2)
     if (HAVE_RULES)
         target_link_libraries(testrunner pcre)
     endif()
Index: cppcheck-1.90/lib/CMakeLists.txt
===================================================================
--- cppcheck-1.90.orig/lib/CMakeLists.txt
+++ cppcheck-1.90/lib/CMakeLists.txt
@@ -1,5 +1,4 @@
 include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/)
-include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/)
 include_directories(${PROJECT_SOURCE_DIR}/externals/simplecpp/)
 
 file(GLOB_RECURSE hdrs "*.h")
