CMake:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index baade761d7d118b0de7d78961e05b5702e3b76b2..d23b9f6f9819c1e4421cbc9e1986f47c6da82211 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,6 +137,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_HELLO_INSTALL_RES_DATA)
 
+# Accumulate environment variables for HELLO 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/SalomeHELLOConfig.cmake.in b/SalomeHELLOConfig.cmake.in
index 7c77a1f09ab42e7875b09bbbc71cfafd3ee2a424..c86b7c73997080ecb9d150b1f91c32645f0b1197 100644 (file)
--- a/SalomeHELLOConfig.cmake.in
+++ b/SalomeHELLOConfig.cmake.in
@@ -46,6 +46,9 @@ SET_AND_CHECK(HELLO_INCLUDE_DIRS "${HELLO_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@
 SET(HELLO_INCLUDE_DIRS "${HELLO_INCLUDE_DIRS};@_SalomeHELLO_EXTRA_HEADERS@")
 SET(HELLO_DEFINITIONS "@GUI_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomeHELLO_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package:

diff --git a/adm_local/cmake_files/FindSalomeHELLO.cmake b/adm_local/cmake_files/FindSalomeHELLO.cmake
index 89fae809605fd30b4931d6579e8af64230dd8978..b7f3f6cdef05cfc8230f83a9bda1b4aaaf6e1e60 100644 (file)
--- a/adm_local/cmake_files/FindSalomeHELLO.cmake
+++ b/adm_local/cmake_files/FindSalomeHELLO.cmake
@@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeHELLO SalomeHELLO CONFIG)
 IF(NOT SalomeHELLO_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome HELLO: ${HELLO_ROOT_DIR}")
 ENDIF()
+
+FOREACH(_res ${SalomeHELLO_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeHELLO_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file