Replace tinyxml2_LIBRARY with tinyxml2_LIBRARIES (cppcheck-opensource#3897)

gdsotirov · firewave · commit dd32660f9f98 · 2022-03-18T09:33:36.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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()
diff --git 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()
+    target_link_libraries(test-xmlreportv2 ${tinyxml2_LIBRARIES})
+endif()
diff --git 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
@@ -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)
