CMake:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8927f50d39ec7d81b5f1eb61146bd7483ca550b8..ee3f496da3673f895814bad474e17c6bc92cb632 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,6 +179,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_HEXABLOCKPLUGIN_INSTALL_RES_DATA)
 
+# Accumulate environment variables for HEXABLOCKPLUGIN 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/SalomeHEXABLOCKPLUGINConfig.cmake.in b/SalomeHEXABLOCKPLUGINConfig.cmake.in
index fc7c289947bcaeae803f2df2d4115ce05c247ac3..718e5d3196714de07b4d748664cc4e40b925d776 100644 (file)
--- a/SalomeHEXABLOCKPLUGINConfig.cmake.in
+++ b/SalomeHEXABLOCKPLUGINConfig.cmake.in
@@ -46,6 +46,9 @@ SET_AND_CHECK(HEXABLOCKPLUGIN_INCLUDE_DIRS "${HEXABLOCKPLUGIN_ROOT_DIR_EXP}/@SAL
 SET(HEXABLOCKPLUGIN_INCLUDE_DIRS "${HEXABLOCKPLUGIN_INCLUDE_DIRS};@_SalomeHEXABLOCKPLUGIN_EXTRA_HEADERS@")
 SET(HEXABLOCKPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomeHEXABLOCKPLUGIN_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package:

diff --git a/adm_local/cmake_files/FindSalomeHEXABLOCKPLUGIN.cmake b/adm_local/cmake_files/FindSalomeHEXABLOCKPLUGIN.cmake
index 3e4d4e4329516232860076b6683379d67fe28276..fdf1a927d53ade8f3428cc3d0462d71b55a12a00 100644 (file)
--- a/adm_local/cmake_files/FindSalomeHEXABLOCKPLUGIN.cmake
+++ b/adm_local/cmake_files/FindSalomeHEXABLOCKPLUGIN.cmake
@@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeHEXABLOCKPLUGIN SalomeHEXABLOCKPLUGIN CONFIG)
 IF(NOT SalomeHEXABLOCKPLUGIN_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome HEXABLOCKPLUGIN: ${HEXABLOCKPLUGIN_ROOT_DIR}")
 ENDIF()
+
+FOREACH(_res ${SalomeHEXABLOCKPLUGIN_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeHEXABLOCKPLUGIN_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file