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 22:17:03 +02:00 committed by GitHub
parent 1aff160411
commit 33315b0ae5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/CMakeLists.txt
View File

@ -40,7 +40,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()
if (USE_THREADS) if (USE_THREADS)
target_link_libraries(cppcheck ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(cppcheck ${CMAKE_THREAD_LIBS_INIT})

4
cmake/findDependencies.cmake
View File

@ -48,8 +48,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()
set(tinyxml2_FOUND 1) set(tinyxml2_FOUND 1)

2
cmake/printInfo.cmake
View File

@ -64,7 +64,7 @@ if (USE_Z3)
endif() endif()
message( STATUS "USE_BUNDLED_TINYXML2 = ${USE_BUNDLED_TINYXML2}" ) message( STATUS "USE_BUNDLED_TINYXML2 = ${USE_BUNDLED_TINYXML2}" )
if (NOT USE_BUNDLED_TINYXML2) if (NOT USE_BUNDLED_TINYXML2)
message(STATUS "tinyxml2_LIBRARY = ${tinyxml2_LIBRARY}") message(STATUS "tinyxml2_LIBRARIES = ${tinyxml2_LIBRARIES}")
endif() endif()
message( STATUS ) message( STATUS )

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 ${QT_CORE_LIB} ${QT_GUI_LIB} ${QT_WIDGETS_LIB} ${QT_PRINTSUPPORT_LIB} ${QT_HELP_LIB}) target_link_libraries(cppcheck-gui ${QT_CORE_LIB} ${QT_GUI_LIB} ${QT_WIDGETS_LIB} ${QT_PRINTSUPPORT_LIB} ${QT_HELP_LIB})
if(WITH_QCHART) if(WITH_QCHART)

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

@ -20,7 +20,7 @@ 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()
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@ -30,4 +30,4 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
endif() endif()
# caused by Q_UNUSED macro # caused by Q_UNUSED macro
set_source_files_properties(moc_benchmarksimple.cpp PROPERTIES COMPILE_FLAGS -Wno-extra-semi-stmt) set_source_files_properties(moc_benchmarksimple.cpp PROPERTIES COMPILE_FLAGS -Wno-extra-semi-stmt)
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 (USE_THREADS) if (USE_THREADS)
target_link_libraries(testrunner ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(testrunner ${CMAKE_THREAD_LIBS_INIT})