Merge branch 'gz-sim9' into dockerbuildfix

gazebosim · Nov 14, 2024 · 5bb243c · 5bb243c
2 parents fec291b + 57599fb
commit 5bb243c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -105,7 +105,7 @@ if (BUILD_TESTING)
     endif()
 
     set(_env_vars)
-    list(APPEND _env_vars "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python/")
+    list(APPEND _env_vars "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python/:$ENV{PYTHONPATH}")
     list(APPEND _env_vars "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}:$ENV{LD_LIBRARY_PATH}")
     set_tests_properties(${test} PROPERTIES
       ENVIRONMENT "${_env_vars}")

diff --git a/src/systems/optical_tactile_plugin/OpticalTactilePlugin.cc b/src/systems/optical_tactile_plugin/OpticalTactilePlugin.cc
@@ -632,7 +632,7 @@ void OpticalTactilePluginPrivate::Enable(const gz::msgs::Boolean &_req)
 
   this->enabled = _req.data();
 
-  if (!_req.data())
+  if (!_req.data() && this->visualizePtr)
   {
     this->visualizePtr->RemoveNormalForcesAndContactsMarkers();
   }

diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
@@ -246,5 +246,5 @@ endif()
 
 if (TARGET INTEGRATION_python_system_loader)
   set_tests_properties(INTEGRATION_python_system_loader PROPERTIES
-    ENVIRONMENT "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python/")
+    ENVIRONMENT "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python/:$ENV{PYTHONPATH}")
 endif()