From 199fe343c3bb9707b516d75afcc51e0874b9636c Mon Sep 17 00:00:00 2001
From: "Georgi D. Sotirov" <gdsotirov@gmail.com>
Date: Tue, 15 Mar 2022 21:17:03 +0100
Subject: [PATCH] Replace tinyxml2_LIBRARY with tinyxml2_LIBRARIES (#3897)

---
 cli/CMakeLists.txt                       | 2 +-
 cmake/findDependencies.cmake             | 4 ++--
 cmake/printInfo.cmake                    | 3 +++
 gui/CMakeLists.txt                       | 2 +-
 gui/test/benchmark/simple/CMakeLists.txt | 2 +-
 gui/test/xmlreportv2/CMakeLists.txt      | 4 ++--
 oss-fuzz/CMakeLists.txt                  | 2 +-
 test/CMakeLists.txt                      | 2 +-
 8 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index 1ae9ad730..629354086 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -35,7 +35,7 @@ if (WIN32 AND NOT BORLAND)
     endif()
 endif()
 if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-    target_link_libraries(cppcheck ${tinyxml2_LIBRARY})
+    target_link_libraries(cppcheck ${tinyxml2_LIBRARIES})
 endif()
 
 add_dependencies(cppcheck copy_cfg)
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
index cbd50f19b..4d5b9efc5 100644
--- a/cmake/findDependencies.cmake
+++ b/cmake/findDependencies.cmake
@@ -49,8 +49,8 @@ endif()
 if (NOT USE_BUNDLED_TINYXML2)
     find_package(tinyxml2 QUIET)
     if (NOT tinyxml2_FOUND)
-        find_library(tinyxml2_LIBRARY tinyxml2)
-        if (NOT tinyxml2_LIBRARY)
+        find_library(tinyxml2_LIBRARIES tinyxml2)
+        if (NOT tinyxml2_LIBRARIES)
             message(FATAL_ERROR "tinyxml2 has not been found")
         else()
             message(STATUS "tinyxml2_LIBRARY: ${tinyxml2_LIBRARY}")
diff --git a/cmake/printInfo.cmake b/cmake/printInfo.cmake
index 3fb2495ee..2fd971b1d 100644
--- a/cmake/printInfo.cmake
+++ b/cmake/printInfo.cmake
@@ -53,6 +53,9 @@ if (USE_Z3)
     message( STATUS "Z3_CXX_INCLUDE_DIRS =   ${Z3_CXX_INCLUDE_DIRS}" )
 endif()
 message( STATUS "USE_BUNDLED_TINYXML2 =  ${USE_BUNDLED_TINYXML2}" )
+if (NOT USE_BUNDLED_TINYXML2)
+    message(STATUS "tinyxml2_LIBRARIES =       ${tinyxml2_LIBRARIES}")
+endif()
 message( STATUS )
 
 if(${ANALYZE_ADDRESS})
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 213ad5918..4f265f7fc 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -36,7 +36,7 @@ if (BUILD_GUI)
         target_link_libraries(cppcheck-gui ${Z3_LIBRARIES})
     endif()
     if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-        target_link_libraries(cppcheck-gui tinyxml2)
+        target_link_libraries(cppcheck-gui ${tinyxml2_LIBRARIES})
     endif()
     target_link_libraries(cppcheck-gui Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Help)
     if(WITH_QCHART)
diff --git a/gui/test/benchmark/simple/CMakeLists.txt b/gui/test/benchmark/simple/CMakeLists.txt
index 036b4e3cb..c6c6cd672 100644
--- a/gui/test/benchmark/simple/CMakeLists.txt
+++ b/gui/test/benchmark/simple/CMakeLists.txt
@@ -20,5 +20,5 @@ if (USE_Z3)
     target_link_libraries(benchmark-simple ${Z3_LIBRARIES})
 endif()
 if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-    target_link_libraries(benchmark-simple ${tinyxml2_LIBRARY})
+    target_link_libraries(benchmark-simple ${tinyxml2_LIBRARIES})
 endif()
\ No newline at end of file
diff --git a/gui/test/xmlreportv2/CMakeLists.txt b/gui/test/xmlreportv2/CMakeLists.txt
index b09cc432e..97932d8e8 100644
--- a/gui/test/xmlreportv2/CMakeLists.txt
+++ b/gui/test/xmlreportv2/CMakeLists.txt
@@ -24,5 +24,5 @@ if (USE_Z3)
     target_link_libraries(test-xmlreportv2 ${Z3_LIBRARIES})
 endif()
 if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-    target_link_libraries(test-xmlreportv2 ${tinyxml2_LIBRARY})
-endif()
\ No newline at end of file
+    target_link_libraries(test-xmlreportv2 ${tinyxml2_LIBRARIES})
+endif()
diff --git a/oss-fuzz/CMakeLists.txt b/oss-fuzz/CMakeLists.txt
index 5b2c5e059..e3117b05a 100644
--- a/oss-fuzz/CMakeLists.txt
+++ b/oss-fuzz/CMakeLists.txt
@@ -25,7 +25,7 @@ if (ENABLE_OSS_FUZZ AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         target_link_libraries(fuzz-client PRIVATE ${Z3_LIBRARIES})
     endif()
     if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-        target_link_libraries(fuzz-client PRIVATE tinyxml2)
+        target_link_libraries(fuzz-client PRIVATE ${tinyxml2_LIBRARIES})
     endif()
 
     add_executable(translate EXCLUDE_FROM_ALL
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index caff36897..082ca253a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -26,7 +26,7 @@ if (BUILD_TESTS)
         endif()
     endif()
     if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-        target_link_libraries(testrunner ${tinyxml2_LIBRARY})
+        target_link_libraries(testrunner ${tinyxml2_LIBRARIES})
     endif()
 
     if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)