CMake:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2529a6019a32352136dbad7fd169fdc6e8737b4a..fc81a717d060945177bcceff079f56f7b62b1cc7 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,6 +140,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_ATOMSOLV_INSTALL_RES_DATA)
 
+# Accumulate environment variables for ATOMSOLV 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 
 # ========
 ADD_SUBDIRECTORY(idl)

diff --git a/SalomeATOMSOLVConfig.cmake.in b/SalomeATOMSOLVConfig.cmake.in
index ffa41d97e3b763dca234f4b409be37d8c3b1e379..5915f4580454629e8ec0e30213cbeccb0dabb2b6 100644 (file)
--- a/SalomeATOMSOLVConfig.cmake.in
+++ b/SalomeATOMSOLVConfig.cmake.in
@@ -46,6 +46,9 @@ SET_AND_CHECK(ATOMSOLV_INCLUDE_DIRS "${ATOMSOLV_ROOT_DIR_EXP}/@SALOME_INSTALL_HE
 SET(ATOMSOLV_INCLUDE_DIRS "${ATOMSOLV_INCLUDE_DIRS};@_SalomeATOMSOLV_EXTRA_HEADERS@")
 SET(ATOMSOLV_DEFINITIONS "@ATOMGEN_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomeATOMSOLV_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package:

diff --git a/adm_local/cmake_files/FindSalomeATOMSOLV.cmake b/adm_local/cmake_files/FindSalomeATOMSOLV.cmake
index 6b98bada1fece280c5eb1685149f5e344684c288..2d765579d91435dc3fd40105b97feede58ff56bc 100644 (file)
--- a/adm_local/cmake_files/FindSalomeATOMSOLV.cmake
+++ b/adm_local/cmake_files/FindSalomeATOMSOLV.cmake
@@ -28,3 +28,7 @@ SALOME_FIND_PACKAGE(SalomeATOMSOLV SalomeATOMSOLV CONFIG)
 IF(NOT SalomeATOMSOLV_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome ATOMSOLV: ${ATOMSOLV_ROOT_DIR}")
 ENDIF()
+
+FOREACH(_res ${SalomeATOMSOLV_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeATOMSOLV_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file