CMake:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a28681094e5bd83158ab30efd90f76ec2366a810..bff965121708c5dbf70e7862072b7f3bbc61848d 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,6 +121,11 @@ MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED)
 MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC)
 MARK_AS_ADVANCED(SALOME_CALCULATOR_INSTALL_RES_DATA)
 
+# Accumulate environment variables for CALCULATOR module
+SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
+                                         ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON})
+SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
+
 # Sources 
 # ========
 

diff --git a/SalomeCALCULATORConfig.cmake.in b/SalomeCALCULATORConfig.cmake.in
index ef6728e31421920e620183d692bdf6f4a9245bcf..9777503e0b48ac247be021254b4214d46c2cbd9f 100644 (file)
--- a/SalomeCALCULATORConfig.cmake.in
+++ b/SalomeCALCULATORConfig.cmake.in
@@ -46,6 +46,9 @@ SET_AND_CHECK(CALCULATOR_INCLUDE_DIRS "${CALCULATOR_ROOT_DIR_EXP}/@SALOME_INSTAL
 SET(CALCULATOR_INCLUDE_DIRS "${CALCULATOR_INCLUDE_DIRS};@_SalomeCALCULATOR_EXTRA_HEADERS@")
 SET(CALCULATOR_DEFINITIONS "@MED_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomeCALCULATOR_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package:

diff --git a/adm_local/cmake_files/FindSalomeCALCULATOR.cmake b/adm_local/cmake_files/FindSalomeCALCULATOR.cmake
index 7de3368fadb0422284286679cc51079162c5f67d..1c2c4c4cc455cf4154d28e04048ebe14297304bd 100644 (file)
--- a/adm_local/cmake_files/FindSalomeCALCULATOR.cmake
+++ b/adm_local/cmake_files/FindSalomeCALCULATOR.cmake
@@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeCALCULATOR SalomeCALCULATOR CONFIG)
 IF(NOT SalomeCALCULATOR_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome CALCULATOR: ${CALCULATOR_ROOT_DIR}")
 ENDIF()
+
+FOREACH(_res ${SalomeCALCULATOR_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeCALCULATOR_EXTRA_ENV_${_res}}")
+ENDFOREACH()