Blob Blame History Raw
diff -up cppcheck-1.70/cli/CMakeLists.txt.tinyxml cppcheck-1.70/cli/CMakeLists.txt
--- cppcheck-1.70/cli/CMakeLists.txt.tinyxml	2015-09-04 20:04:31.000000000 +0200
+++ cppcheck-1.70/cli/CMakeLists.txt	2015-11-05 18:53:51.310937488 +0100
@@ -1,4 +1,3 @@
-include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/)
 include_directories(${PROJECT_SOURCE_DIR}/lib/)
 
 file(GLOB hdrs "*.h")
@@ -6,7 +5,7 @@ file(GLOB srcs "*.cpp")
 file(GLOB mainfile "main.cpp")
 list(REMOVE_ITEM srcs ${mainfile})
 
-link_libraries(${PROJECT_NAME} tinyxml)
+link_libraries(${PROJECT_NAME} -ltinyxml2)
 
 add_library(cli_lib OBJECT ${hdrs} ${srcs})
 
diff -up cppcheck-1.70/CMakeLists.txt.tinyxml cppcheck-1.70/CMakeLists.txt
--- cppcheck-1.70/CMakeLists.txt.tinyxml	2015-09-04 20:04:31.000000000 +0200
+++ cppcheck-1.70/CMakeLists.txt	2015-11-05 18:54:41.847932573 +0100
@@ -10,7 +10,6 @@ include(cmake/buildFiles.cmake REQUIRED)
 
 file(GLOB cfgs "cfg/*.cfg")
 
-add_subdirectory(externals/tinyxml)
 add_subdirectory(lib)   # CppCheck Library 
 add_subdirectory(cli)   # Client application
 add_subdirectory(test)  # Tests
diff -up cppcheck-1.70/gui/CMakeLists.txt.tinyxml cppcheck-1.70/gui/CMakeLists.txt
--- cppcheck-1.70/gui/CMakeLists.txt.tinyxml	2015-09-04 20:04:31.000000000 +0200
+++ cppcheck-1.70/gui/CMakeLists.txt	2015-11-05 18:54:32.016937559 +0100
@@ -11,7 +11,6 @@ if (BUILD_GUI)
     endif()
     
 
-    include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/)
     include_directories(${PROJECT_SOURCE_DIR}/lib/)
 
     file(GLOB hdrs "*.h")
@@ -22,7 +21,7 @@ if (BUILD_GUI)
     QT4_ADD_RESOURCES(resources "gui.qrc")
     QT4_ADD_TRANSLATION(qms ${tss})
     
-    link_libraries(${PROJECT_NAME} tinyxml ${QT_LIBRARIES})
+    link_libraries(${PROJECT_NAME} -ltinyxml2 ${QT_LIBRARIES})
 
     add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms})
 
diff -up cppcheck-1.70/test/CMakeLists.txt.tinyxml cppcheck-1.70/test/CMakeLists.txt
--- cppcheck-1.70/test/CMakeLists.txt.tinyxml	2015-09-04 20:04:31.000000000 +0200
+++ cppcheck-1.70/test/CMakeLists.txt	2015-11-05 18:54:08.667937833 +0100
@@ -3,13 +3,12 @@ if (BUILD_TESTS)
     include_directories(
         ${PROJECT_SOURCE_DIR}/lib/
         ${PROJECT_SOURCE_DIR}/cli/
-        ${PROJECT_SOURCE_DIR}/externals/tinyxml
     )
 
     file(GLOB hdrs "*.h")
     file(GLOB srcs "*.cpp")
 
-    link_libraries(${PROJECT_NAME} tinyxml)
+    link_libraries(${PROJECT_NAME} -ltinyxml2)
 
     add_executable(testrunner ${hdrs} ${srcs} 
         $<TARGET_OBJECTS:cli_lib>