Merge branch 'gz-common5' into mjcarroll/examples_from_cmake

gazebosim · Jul 15, 2023 · 822a79d · 822a79d
2 parents b04243d + 5f240a5
commit 822a79d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
@@ -5,6 +5,10 @@ if (SKIP_av OR INTERNAL_SKIP_av)
   list(REMOVE_ITEM tests video_encoder.cc)
 endif()
 
+if (SKIP_graphics OR INTERNAL_SKIP_graphics)
+  list(REMOVE_ITEM tests mesh.cc)
+endif()
+
 gz_build_tests(
   TYPE INTEGRATION
   SOURCES ${tests}
@@ -19,10 +23,12 @@ if(TARGET INTEGRATION_plugin)
   target_include_directories(INTEGRATION_plugin PRIVATE ${PROJECT_SOURCE_DIR}/test)
 endif()
 
+# Graphics specific integration tests
 if(TARGET INTEGRATION_mesh)
   target_link_libraries(INTEGRATION_mesh ${PROJECT_LIBRARY_TARGET_NAME}-graphics)
 endif()
 
+# AV specific integration tests
 if(TARGET INTEGRATION_encoder_timing)
   target_link_libraries(INTEGRATION_encoder_timing ${PROJECT_LIBRARY_TARGET_NAME}-av)
 endif()