CMake:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec651cc054537db49eec42a58568cc3b56334b00..a4046a136a68d227bb5226d273644822c8e41caf 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,6 +188,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_GHS3DPRLPLUGIN_INSTALL_RES_DATA)
 
+# Accumulate environment variables for GHS3DPRLPLUGIN 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/SalomeGHS3DPRLPLUGINConfig.cmake.in b/SalomeGHS3DPRLPLUGINConfig.cmake.in
index 5abc5e9be096afbe1ed4aeb6c70ba175eccce800..69865d0d910d0ddb1e2fb55b79dbf72a54e44a49 100644 (file)
--- a/SalomeGHS3DPRLPLUGINConfig.cmake.in
+++ b/SalomeGHS3DPRLPLUGINConfig.cmake.in
@@ -46,6 +46,9 @@ SET_AND_CHECK(GHS3DPRLPLUGIN_INCLUDE_DIRS "${GHS3DPRLPLUGIN_ROOT_DIR_EXP}/@SALOM
 SET(GHS3DPRLPLUGIN_INCLUDE_DIRS "${GHS3DPRLPLUGIN_INCLUDE_DIRS};@_SalomeGHS3DPRLPLUGIN_EXTRA_HEADERS@")
 SET(GHS3DPRLPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomeGHS3DPRLPLUGIN_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package:

diff --git a/adm_local/cmake_files/FindSalomeGHS3DPRLPLUGIN.cmake b/adm_local/cmake_files/FindSalomeGHS3DPRLPLUGIN.cmake
index b766fc7add10990b60fdb99d79f508ad6e87756e..e7d79b45e13af3b501db151d60832dbaf79643ec 100644 (file)
--- a/adm_local/cmake_files/FindSalomeGHS3DPRLPLUGIN.cmake
+++ b/adm_local/cmake_files/FindSalomeGHS3DPRLPLUGIN.cmake
@@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeGHS3DPRLPLUGIN SalomeGHS3DPRLPLUGIN CONFIG)
 IF(NOT SalomeGHS3DPLUGIN_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome GHS3DPRLPLUGIN: ${GHS3DPRLPLUGIN_ROOT_DIR}")
 ENDIF()
+
+FOREACH(_res ${SalomeGHS3DPRLPLUGIN_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeGHS3DPRLPLUGIN_EXTRA_ENV_${_res}}")
+ENDFOREACH()