CMake:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7666973225d556e89990e59b9b4404242ff3018..205a7c1cc54f896f350fd9f274d87c3a9cc28722 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,6 +135,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_PYHELLO_INSTALL_RES_DATA)
 
+# Accumulate environment variables for PYHELLO 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 
 # ========
 

diff --git a/SalomePYHELLOConfig.cmake.in b/SalomePYHELLOConfig.cmake.in
index 592f09810a2956816e7b8b1f2fe4f22bb2c9666f..676869e992bf10ec46ce15726070b218bcfaa5e3 100644 (file)
--- a/SalomePYHELLOConfig.cmake.in
+++ b/SalomePYHELLOConfig.cmake.in
@@ -40,6 +40,9 @@ SET_AND_CHECK(PYHELLO_INCLUDE_DIRS "${PYHELLO_ROOT_DIR_EXP}/@SALOME_INSTALL_HEAD
 SET(PYHELLO_INCLUDE_DIRS "${PYHELLO_INCLUDE_DIRS};@_SalomePYHELLO_EXTRA_HEADERS@")
 SET(PYHELLO_DEFINITIONS "@GUI_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomePYHELLO_EXTRA_ENV_FULL@
+
 # Load the dependencies for the libraries of @PROJECT_NAME@ 
 # (contains definitions for IMPORTED targets). This is only 
 # imported if we are not built as a subproject (in this case targets are already there)

diff --git a/adm_local/cmake_files/FindSalomePYHELLO.cmake b/adm_local/cmake_files/FindSalomePYHELLO.cmake
index 7e5caa6d3786818d7ba895d08ced29143dd60d3b..f9a7544e3351f856e0e7e98f7f60f1a8c1e89b0d 100644 (file)
--- a/adm_local/cmake_files/FindSalomePYHELLO.cmake
+++ b/adm_local/cmake_files/FindSalomePYHELLO.cmake
@@ -27,4 +27,8 @@ SALOME_FIND_PACKAGE(SalomePYHELLO SalomePYHELLO CONFIG)
 
 IF(NOT SalomePYHELLO_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome PYHELLO: ${PYHELLO_ROOT_DIR}")
-ENDIF()
\ No newline at end of file
+ENDIF()
+
+FOREACH(_res ${SalomePYHELLO_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomePYHELLO_EXTRA_ENV_${_res}}")
+ENDFOREACH()