Merge branch 'main' into mjcarroll/fix_uuid_msvc

Signed-off-by: Michael Carroll <[email protected]>

graphics/src/CMakeLists.txt

@@ -9,14 +9,17 @@ target_link_libraries(${graphics_target}
   PRIVATE
     ${GzAssimp_LIBRARIES}
     GTS::GTS
-    FreeImage::FreeImage)
+    FreeImage::FreeImage
+    TINYXML2::TINYXML2
+)
 
 gz_build_tests(
   TYPE UNIT
   SOURCES ${gtest_sources}
   LIB_DEPS
     ${graphics_target}
     gz-common${GZ_COMMON_VER}-testing
+    TINYXML2::TINYXML2
 )
 
 # Assimp doesn't offer preprocessor version, use cmake to set a compatibility
@@ -28,16 +31,3 @@ if(${GzAssimp_VERSION} STRLESS "5.2.0")
     target_compile_definitions(UNIT_AssimpLoader_TEST PRIVATE GZ_ASSIMP_PRE_5_2_0)
   endif()
 endif()
-
-
-# If we are using an external copy of tinyxml2, add its imported target
-target_link_libraries(${graphics_target}
-  PRIVATE
-    TINYXML2::TINYXML2)
-
-# The collada exporter test uses tinyxml2, so we must link it if we're using
-# an external copy. The graphics target considers tinyxml2 to be a private
-# dependency, so it will not automatically get linked to this test.
-if(TARGET UNIT_ColladaExporter_TEST)
-  target_link_libraries(UNIT_ColladaExporter_TEST TINYXML2::TINYXML2)
-endif()