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