Attachment 1475629 Details for Bug 1590041 – new patch for tinyxml

[patch] new patch for tinyxml

cppcheck-1.84-tinyxml.patch (text/plain), 4.27 KB, created by Steve Grubb on 2018-08-13 17:37:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Grubb

Created: 2018-08-13 17:37:52 UTC

Size: 4.27 KB

patch

obsolete

>diff -ur cppcheck-1.84.orig/cli/CMakeLists.txt cppcheck-1.84/cli/CMakeLists.txt
>--- cppcheck-1.84.orig/cli/CMakeLists.txt	2018-06-10 16:41:03.000000000 -0400
>+++ cppcheck-1.84/cli/CMakeLists.txt	2018-08-13 13:11:17.191381897 -0400
>@@ -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,13 +7,14 @@
> 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>)
> if (HAVE_RULES)
>     target_link_libraries(cppcheck pcre)
> endif()
> if (MSVC)
>     target_link_libraries(cppcheck Shlwapi.lib)
> endif()
>+target_link_libraries(cppcheck tinyxml2)
> 
> install(TARGETS cppcheck
>     RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
>Only in cppcheck-1.84/cli: CMakeLists.txt.orig
>Only in cppcheck-1.84/cli: CMakeLists.txt.rej
>diff -ur cppcheck-1.84.orig/CMakeLists.txt cppcheck-1.84/CMakeLists.txt
>--- cppcheck-1.84.orig/CMakeLists.txt	2018-06-10 16:41:03.000000000 -0400
>+++ cppcheck-1.84/CMakeLists.txt	2018-08-13 13:09:05.904395985 -0400
>@@ -16,7 +16,6 @@
>     enable_testing()
> endif()
> 
>-add_subdirectory(externals/tinyxml)
> add_subdirectory(externals/simplecpp)
> add_subdirectory(lib)   # CppCheck Library 
> add_subdirectory(cli)   # Client application
>Only in cppcheck-1.84: .codacy.yml
>Only in cppcheck-1.84: .gitignore
>diff -ur cppcheck-1.84.orig/gui/CMakeLists.txt cppcheck-1.84/gui/CMakeLists.txt
>--- cppcheck-1.84.orig/gui/CMakeLists.txt	2018-06-10 16:41:03.000000000 -0400
>+++ cppcheck-1.84/gui/CMakeLists.txt	2018-08-13 13:13:52.843365194 -0400
>@@ -10,7 +10,6 @@
>     endif()
> 
>     include_directories(${PROJECT_SOURCE_DIR}/lib/)
>-    include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/)
> 
>     file(GLOB hdrs "*.h")
>     file(GLOB srcs "*.cpp")
>@@ -20,11 +19,11 @@
>     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>)
>     if (HAVE_RULES)
>         target_link_libraries(cppcheck-gui pcre)
>     endif()
>-    target_link_libraries(cppcheck-gui Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport)
>+    target_link_libraries(cppcheck-gui tinyxml2 Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport)
> 
>     install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
>     install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
>Only in cppcheck-1.84/gui: CMakeLists.txt.orig
>Only in cppcheck-1.84/gui: CMakeLists.txt.rej
>Only in cppcheck-1.84: .mailmap
>diff -ur cppcheck-1.84.orig/test/CMakeLists.txt cppcheck-1.84/test/CMakeLists.txt
>--- cppcheck-1.84.orig/test/CMakeLists.txt	2018-06-10 16:41:03.000000000 -0400
>+++ cppcheck-1.84/test/CMakeLists.txt	2018-08-13 13:09:05.949395981 -0400
>@@ -1,16 +1,16 @@
> if (BUILD_TESTS)
> 
>     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>)
>     if (HAVE_RULES)
>         target_link_libraries(testrunner pcre)
>     endif()
>+    target_link_libraries(testrunner tinyxml2)
> 
>     add_custom_target(copy_cfg ALL
>         COMMENT "Copying cfg files")
>Only in cppcheck-1.84: .travis_llvmcheck_suppressions
>Only in cppcheck-1.84: .travis_suppressions
>Only in cppcheck-1.84: .travis.yml

Actions: View | Diff

Attachments on bug 1590041: 1475629 | 1475630