CMake:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3722cbec499f107eeec396f034d86dd50ffaadd1..4221f8df20c7ac0a801f006f0358d827efdf219c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -169,6 +169,10 @@ MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED)
 MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC)
 MARK_AS_ADVANCED(SALOME_HEXABLOCK_INSTALL_RES_DATA)
 
+# Accumulate environment variables for HEXABLOCK module
+SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS})
+SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
+
 # Sources
 # ========
 

diff --git a/SalomeHEXABLOCKConfig.cmake.in b/SalomeHEXABLOCKConfig.cmake.in
index a7eb17a34c9c95bbd693b2ca3fc176db79583653..08dc6f351911d0192623a95667a2b4de92be1cd6 100644 (file)
--- a/SalomeHEXABLOCKConfig.cmake.in
+++ b/SalomeHEXABLOCKConfig.cmake.in
@@ -46,6 +46,9 @@ SET_AND_CHECK(HEXABLOCK_INCLUDE_DIRS "${HEXABLOCK_ROOT_DIR_EXP}/@SALOME_INSTALL_
 SET(HEXABLOCK_INCLUDE_DIRS "${HEXABLOCK_INCLUDE_DIRS};@_SalomeHEXABLOCK_EXTRA_HEADERS@")
 SET(HEXABLOCK_DEFINITIONS "@GEOM_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomeHEXABLOCK_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package:

diff --git a/adm_local/cmake_files/FindSalomeHEXABLOCK.cmake b/adm_local/cmake_files/FindSalomeHEXABLOCK.cmake
index 9cc94cbc5a7c297fb0d35b4f4231aefaa8d6cc91..a1ccb0f61a442968441bd7424f7521d5811110c3 100644 (file)
--- a/adm_local/cmake_files/FindSalomeHEXABLOCK.cmake
+++ b/adm_local/cmake_files/FindSalomeHEXABLOCK.cmake
@@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeHEXABLOCK SalomeHEXABLOCK CONFIG)
 IF(NOT SalomeHEXABLOCK_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome HEXABLOCK: ${HEXABLOCK_ROOT_DIR}")
 ENDIF()
+
+FOREACH(_res ${SalomeHEXABLOCK_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeHEXABLOCK_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file