Attachment #237516 for bug #267262

Lines 1-5 Link Here

(-)b/devel/cppcheck/Makefile (-1 / +1 lines)
1	PORTNAME= cppcheck	1	PORTNAME= cppcheck
2	PORTVERSION= 2.7.5	2	PORTVERSION= 2.9
3	PORTREVISION?= 0 # devel/cppcheck-gui	3	PORTREVISION?= 0 # devel/cppcheck-gui
4	CATEGORIES= devel	4	CATEGORIES= devel
5		5

Lines 1-3 Link Here

(-)b/devel/cppcheck/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1650279480	1	TIMESTAMP = 1661696280
2	SHA256 (danmar-cppcheck-2.7.5_GH0.tar.gz) = 6c7ac29e57fa8b3ac7be224510200e579d5a90217e2152591ef46ffc947d8f78	2	SHA256 (danmar-cppcheck-2.9_GH0.tar.gz) = 56aee8b5bdf936ab7adc9ab43903ba2052f088695c80f047682024a1ed0ef3f3
3	SIZE (danmar-cppcheck-2.7.5_GH0.tar.gz) = 3940968	3	SIZE (danmar-cppcheck-2.9_GH0.tar.gz) = 3916529




--- cli/CMakeLists.txt.orig	2022-08-28 12:43:18 UTC
+++ cli/CMakeLists.txt
@@ -37,7 +37,7 @@ if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
     endif()
 endif()
 if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-    target_link_libraries(cppcheck ${tinyxml2_LIBRARIES})
+    target_link_libraries(cppcheck tinyxml2::tinyxml2)
 endif()
 target_link_libraries(cppcheck ${CMAKE_THREAD_LIBS_INIT})
 
 add_dependencies(cppcheck copy_cfg)




--- gui/CMakeLists.txt.orig	2022-08-28 12:43:18 UTC
+++ gui/CMakeLists.txt
@@ -34,7 +34,7 @@ if (BUILD_GUI)
         target_link_libraries(cppcheck-gui ${PCRE_LIBRARY})
     endif()
     if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-        target_link_libraries(cppcheck-gui ${tinyxml2_LIBRARIES})
+        target_link_libraries(cppcheck-gui tinyxml2::tinyxml2)
     endif()
     target_link_libraries(cppcheck-gui ${QT_CORE_LIB} ${QT_GUI_LIB} ${QT_WIDGETS_LIB} ${QT_PRINTSUPPORT_LIB} ${QT_HELP_LIB})
     if(WITH_QCHART)
@@ -49,7 +49,7 @@ if (BUILD_GUI)
     endif()
 
     install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)




--- gui/test/benchmark/simple/CMakeLists.txt.orig	2022-08-28 12:43:18 UTC
+++ gui/test/benchmark/simple/CMakeLists.txt
@@ -17,7 +17,7 @@ if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
     target_link_libraries(benchmark-simple ${PCRE_LIBRARY})
 endif()
 if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-    target_link_libraries(benchmark-simple ${tinyxml2_LIBRARIES})
-endif()
\ No newline at end of file
+    target_link_libraries(benchmark-simple tinyxml2::tinyxml2)
 endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")

Lines 1-7 Link Here

(-)b/devel/cppcheck/files/patch-gui_test_xmlreportv2_CMakeLists.txt (-3 / +3 lines)
1	--- gui/test/xmlreportv2/CMakeLists.txt.orig 2022-03-19 11:35:06 UTC	1	--- gui/test/xmlreportv2/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC
2	+++ gui/test/xmlreportv2/CMakeLists.txt	2	+++ gui/test/xmlreportv2/CMakeLists.txt
3	@@ -24,5 +24,5 @@ if (USE_Z3)	3	@@ -21,5 +21,5 @@ if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
4	target_link_libraries(test-xmlreportv2 ${Z3_LIBRARIES})	4	target_link_libraries(test-xmlreportv2 ${PCRE_LIBRARY})
5	endif()	5	endif()
6	if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)	6	if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
7	- target_link_libraries(test-xmlreportv2 ${tinyxml2_LIBRARIES})	7	- target_link_libraries(test-xmlreportv2 ${tinyxml2_LIBRARIES})

Lines 1-11 Link Here

(-)b/devel/cppcheck/files/patch-lib_CMakeLists.txt (-6 / +6 lines)
1	--- lib/CMakeLists.txt.orig 2022-03-19 11:35:06 UTC	1	--- lib/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC
2	+++ lib/CMakeLists.txt	2	+++ lib/CMakeLists.txt
3	@@ -36,6 +36,8 @@ add_library(lib_objs OBJECT ${srcs_lib} ${hdrs})	3	@@ -36,6 +36,8 @@ if(USE_BUNDLED_TINYXML2)
4	target_include_directories(lib_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/)	4	target_include_directories(lib_objs SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/externals/)
5	if(USE_BUNDLED_TINYXML2)	5	if(USE_BUNDLED_TINYXML2)
6	target_include_directories(lib_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)	6	target_include_directories(lib_objs SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
7	+else()	7	+else()
8	+ target_link_libraries(lib_objs PRIVATE tinyxml2::tinyxml2)	8	+ target_link_libraries(lib_objs PRIVATE tinyxml2::tinyxml2)
9	endif()	9	endif()
10	target_include_directories(lib_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/)	10	target_include_directories(lib_objs SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/)
11	target_include_directories(lib_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)	11	target_include_directories(lib_objs SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)

Lines 1-7 Link Here

(-)b/devel/cppcheck/files/patch-oss-fuzz_CMakeLists.txt (-3 / +3 lines)
1	--- oss-fuzz/CMakeLists.txt.orig 2022-03-19 11:35:06 UTC	1	--- oss-fuzz/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC
2	+++ oss-fuzz/CMakeLists.txt	2	+++ oss-fuzz/CMakeLists.txt
3	@@ -25,7 +25,7 @@ if (ENABLE_OSS_FUZZ AND CMAKE_CXX_COMPILER_ID MATCHES	3	@@ -22,7 +22,7 @@ if (ENABLE_OSS_FUZZ AND CMAKE_CXX_COMPILER_ID MATCHES
4	target_link_libraries(fuzz-client PRIVATE ${Z3_LIBRARIES})	4	target_link_libraries(fuzz-client PRIVATE ${PCRE_LIBRARY})
5	endif()	5	endif()
6	if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)	6	if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
7	- target_link_libraries(fuzz-client PRIVATE ${tinyxml2_LIBRARIES})	7	- target_link_libraries(fuzz-client PRIVATE ${tinyxml2_LIBRARIES})




--- test/CMakeLists.txt.orig	2022-08-28 12:43:18 UTC
+++ test/CMakeLists.txt
@@ -23,7 +23,7 @@ if (BUILD_TESTS)
         endif()
     endif()
     if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-        target_link_libraries(testrunner ${tinyxml2_LIBRARIES})
+        target_link_libraries(testrunner tinyxml2::tinyxml2)
     endif()
     target_link_libraries(testrunner ${CMAKE_THREAD_LIBS_INIT})
 
     if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
- 

Return to bug 267262

Lines 1-11 Link Here

(-)b/devel/cppcheck/files/patch-cli_CMakeLists.txt (-3 / +3 lines)
1	--- cli/CMakeLists.txt.orig 2022-03-19 11:35:06 UTC	1	--- cli/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC
2	+++ cli/CMakeLists.txt	2	+++ cli/CMakeLists.txt
3	@@ -35,7 +35,7 @@ if (WIN32 AND NOT BORLAND)	3	@@ -37,7 +37,7 @@ if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
4	endif()	4	endif()
5	endif()	5	endif()
6	if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)	6	if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
7	- target_link_libraries(cppcheck ${tinyxml2_LIBRARIES})	7	- target_link_libraries(cppcheck ${tinyxml2_LIBRARIES})
8	+ target_link_libraries(cppcheck tinyxml2::tinyxml2)	8	+ target_link_libraries(cppcheck tinyxml2::tinyxml2)
9	endif()	9	endif()
		10	target_link_libraries(cppcheck ${CMAKE_THREAD_LIBS_INIT})
10		11
11	add_dependencies(cppcheck copy_cfg)

Lines 1-15 Link Here

(-)b/devel/cppcheck/files/patch-gui_CMakeLists.txt (-5 / +5 lines)
1	--- gui/CMakeLists.txt.orig 2022-03-19 11:35:06 UTC	1	--- gui/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC
2	+++ gui/CMakeLists.txt	2	+++ gui/CMakeLists.txt
3	@@ -36,7 +36,7 @@ if (BUILD_GUI)	3	@@ -34,7 +34,7 @@ if (BUILD_GUI)
4	target_link_libraries(cppcheck-gui ${Z3_LIBRARIES})	4	target_link_libraries(cppcheck-gui ${PCRE_LIBRARY})
5	endif()	5	endif()
6	if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)	6	if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
7	- target_link_libraries(cppcheck-gui ${tinyxml2_LIBRARIES})	7	- target_link_libraries(cppcheck-gui ${tinyxml2_LIBRARIES})
8	+ target_link_libraries(cppcheck-gui tinyxml2::tinyxml2)	8	+ target_link_libraries(cppcheck-gui tinyxml2::tinyxml2)
9	endif()	9	endif()
10	target_link_libraries(cppcheck-gui Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Help)	10	target_link_libraries(cppcheck-gui ${QT_CORE_LIB} ${QT_GUI_LIB} ${QT_WIDGETS_LIB} ${QT_PRINTSUPPORT_LIB} ${QT_HELP_LIB})
11	if(WITH_QCHART)	11	if(WITH_QCHART)
12	@@ -51,7 +51,7 @@ if (BUILD_GUI)	12	@@ -49,7 +49,7 @@ if (BUILD_GUI)
13	endif()	13	endif()
14		14
15	install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)	15	install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)

Lines 1-11 Link Here

(-)b/devel/cppcheck/files/patch-gui_test_benchmark_simple_CMakeLists.txt (-6 / +6 lines)
1	--- gui/test/benchmark/simple/CMakeLists.txt.orig 2022-03-19 11:35:06 UTC	1	--- gui/test/benchmark/simple/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC
2	+++ gui/test/benchmark/simple/CMakeLists.txt	2	+++ gui/test/benchmark/simple/CMakeLists.txt
3	@@ -20,5 +20,5 @@ if (USE_Z3)	3	@@ -17,7 +17,7 @@ if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
4	target_link_libraries(benchmark-simple ${Z3_LIBRARIES})	4	target_link_libraries(benchmark-simple ${PCRE_LIBRARY})
5	endif()	5	endif()
6	if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)	6	if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
7	- target_link_libraries(benchmark-simple ${tinyxml2_LIBRARIES})	7	- target_link_libraries(benchmark-simple ${tinyxml2_LIBRARIES})
8	-endif()
9	\ No newline at end of file
10	+ target_link_libraries(benchmark-simple tinyxml2::tinyxml2)	8	+ target_link_libraries(benchmark-simple tinyxml2::tinyxml2)
11	+endif()	9	endif()
		10
		11	if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")

Lines 1-11 Link Here

(-)b/devel/cppcheck/files/patch-test_CMakeLists.txt (-4 / +3 lines)
1	--- test/CMakeLists.txt.orig 2022-03-19 11:35:06 UTC	1	--- test/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC
2	+++ test/CMakeLists.txt	2	+++ test/CMakeLists.txt
3	@@ -26,7 +26,7 @@ if (BUILD_TESTS)	3	@@ -23,7 +23,7 @@ if (BUILD_TESTS)
4	endif()	4	endif()
5	endif()	5	endif()
6	if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)	6	if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
7	- target_link_libraries(testrunner ${tinyxml2_LIBRARIES})	7	- target_link_libraries(testrunner ${tinyxml2_LIBRARIES})
8	+ target_link_libraries(testrunner tinyxml2::tinyxml2)	8	+ target_link_libraries(testrunner tinyxml2::tinyxml2)
9	endif()	9	endif()
		10	target_link_libraries(testrunner ${CMAKE_THREAD_LIBS_INIT})
10		11
11	if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
12	-