Merge branch 'gz-sim9' into fix_optical_tactile_crash

gazebosim · Nov 11, 2024 · bd8ea54 · bd8ea54
2 parents 4c569ae + 0d346de
commit bd8ea54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 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/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()