walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Replace tinyxml2_LIBRARY with tinyxml2_LIBRARIES (#3897)

This commit is contained in:
Georgi D. Sotirov 2022-03-15 21:17:03 +01:00 committed by Daniel Marjamäki
parent d922a3b0bc
commit 199fe343c3
8 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/CMakeLists.txt
View File

@ -35,7 +35,7 @@ if (WIN32 AND NOT BORLAND)
endif() endif()
endif() endif()
if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
target_link_libraries(cppcheck ${tinyxml2_LIBRARY}) target_link_libraries(cppcheck ${tinyxml2_LIBRARIES})
endif() endif()
add_dependencies(cppcheck copy_cfg) add_dependencies(cppcheck copy_cfg)

4
cmake/findDependencies.cmake
View File

@ -49,8 +49,8 @@ endif()
if (NOT USE_BUNDLED_TINYXML2) if (NOT USE_BUNDLED_TINYXML2)
find_package(tinyxml2 QUIET) find_package(tinyxml2 QUIET)
if (NOT tinyxml2_FOUND) if (NOT tinyxml2_FOUND)
find_library(tinyxml2_LIBRARY tinyxml2) find_library(tinyxml2_LIBRARIES tinyxml2)
if (NOT tinyxml2_LIBRARY) if (NOT tinyxml2_LIBRARIES)
message(FATAL_ERROR "tinyxml2 has not been found") message(FATAL_ERROR "tinyxml2 has not been found")
else() else()
message(STATUS "tinyxml2_LIBRARY: ${tinyxml2_LIBRARY}") message(STATUS "tinyxml2_LIBRARY: ${tinyxml2_LIBRARY}")

3
cmake/printInfo.cmake
View File

@ -53,6 +53,9 @@ if (USE_Z3)
message( STATUS "Z3_CXX_INCLUDE_DIRS = ${Z3_CXX_INCLUDE_DIRS}" ) message( STATUS "Z3_CXX_INCLUDE_DIRS = ${Z3_CXX_INCLUDE_DIRS}" )
endif() endif()
message( STATUS "USE_BUNDLED_TINYXML2 = ${USE_BUNDLED_TINYXML2}" ) message( STATUS "USE_BUNDLED_TINYXML2 = ${USE_BUNDLED_TINYXML2}" )
if (NOT USE_BUNDLED_TINYXML2)
message(STATUS "tinyxml2_LIBRARIES = ${tinyxml2_LIBRARIES}")
endif()
message( STATUS ) message( STATUS )
if(${ANALYZE_ADDRESS}) if(${ANALYZE_ADDRESS})

2
gui/CMakeLists.txt
View File

@ -36,7 +36,7 @@ if (BUILD_GUI)
target_link_libraries(cppcheck-gui ${Z3_LIBRARIES}) target_link_libraries(cppcheck-gui ${Z3_LIBRARIES})
endif() endif()
if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
target_link_libraries(cppcheck-gui tinyxml2) target_link_libraries(cppcheck-gui ${tinyxml2_LIBRARIES})
endif() endif()
target_link_libraries(cppcheck-gui Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Help) target_link_libraries(cppcheck-gui Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Help)
if(WITH_QCHART) if(WITH_QCHART)

2
gui/test/benchmark/simple/CMakeLists.txt
View File

@ -20,5 +20,5 @@ if (USE_Z3)
target_link_libraries(benchmark-simple ${Z3_LIBRARIES}) target_link_libraries(benchmark-simple ${Z3_LIBRARIES})
endif() endif()
if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
target_link_libraries(benchmark-simple ${tinyxml2_LIBRARY}) target_link_libraries(benchmark-simple ${tinyxml2_LIBRARIES})
endif() endif()

4
gui/test/xmlreportv2/CMakeLists.txt
View File

@ -24,5 +24,5 @@ if (USE_Z3)
target_link_libraries(test-xmlreportv2 ${Z3_LIBRARIES}) target_link_libraries(test-xmlreportv2 ${Z3_LIBRARIES})
endif() endif()
if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
target_link_libraries(test-xmlreportv2 ${tinyxml2_LIBRARY}) target_link_libraries(test-xmlreportv2 ${tinyxml2_LIBRARIES})
endif() endif()

2
oss-fuzz/CMakeLists.txt
View File

@ -25,7 +25,7 @@ if (ENABLE_OSS_FUZZ AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_link_libraries(fuzz-client PRIVATE ${Z3_LIBRARIES}) target_link_libraries(fuzz-client PRIVATE ${Z3_LIBRARIES})
endif() endif()
if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
target_link_libraries(fuzz-client PRIVATE tinyxml2) target_link_libraries(fuzz-client PRIVATE ${tinyxml2_LIBRARIES})
endif() endif()
add_executable(translate EXCLUDE_FROM_ALL add_executable(translate EXCLUDE_FROM_ALL

2
test/CMakeLists.txt
View File

@ -26,7 +26,7 @@ if (BUILD_TESTS)
endif() endif()
endif() endif()
if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
target_link_libraries(testrunner ${tinyxml2_LIBRARY}) target_link_libraries(testrunner ${tinyxml2_LIBRARIES})
endif() endif()
if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS) if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)