CMake:

- Accumulate environment variables, to be used later to run some command in proper environment.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c109baa444778330ddd566900c3b1e2baefc1406..ec1e51cf1cdb1aff8bbb962e48b3bc3ee4ee7179 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,6 +234,11 @@ MARK_AS_ADVANCED(
   SALOME_INSTALL_HXX2SALOME
   )
 
+# Accumulate environment variables for YACS module
+SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
+                                                 ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON})
+SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
+
 # Sources 
 # ========
 IF(SALOME_YACS_USE_KERNEL AND NOT SALOME_LIGHT_ONLY)

diff --git a/SalomeYACSConfig.cmake.in b/SalomeYACSConfig.cmake.in
index 454f237ab5eea83cfd3fdea5cadab9951e83cbda..c398c4c023616cf463edb876bdeac110c8a2f032 100644 (file)
--- a/SalomeYACSConfig.cmake.in
+++ b/SalomeYACSConfig.cmake.in
@@ -46,6 +46,9 @@ SET_AND_CHECK(YACS_INCLUDE_DIRS "${YACS_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
 SET(YACS_INCLUDE_DIRS "${YACS_INCLUDE_DIRS};@_SalomeYACS_EXTRA_HEADERS@")
 SET(YACS_DEFINITIONS)
 
+# Package specific environment variables
+@_SalomeYACS_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package: