CMake:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 802a2f9794a7d8b03aeebf91147818daa7a39e93..80d333fbba9208273a895d26adf16a0b8be7fbdf 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,6 +183,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_GHS3DPLUGIN_INSTALL_RES_DATA)
 
+# Accumulate environment variables for GHS3DPLUGIN 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/SalomeGHS3DPLUGINConfig.cmake.in b/SalomeGHS3DPLUGINConfig.cmake.in
index b6e7c8ff49b0fde85f4ea1d8d0bc3c15ee2ac0b2..c663f1b2a16561e534b38f4a642d51a6d429645e 100644 (file)
--- a/SalomeGHS3DPLUGINConfig.cmake.in
+++ b/SalomeGHS3DPLUGINConfig.cmake.in
@@ -46,6 +46,9 @@ SET_AND_CHECK(GHS3DPLUGIN_INCLUDE_DIRS "${GHS3DPLUGIN_ROOT_DIR_EXP}/@SALOME_INST
 SET(GHS3DPLUGIN_INCLUDE_DIRS "${GHS3DPLUGIN_INCLUDE_DIRS};@_SalomeGHS3DPLUGIN_EXTRA_HEADERS@")
 SET(GHS3DPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomeGHS3DPLUGIN_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package:

diff --git a/adm_local/cmake_files/FindSalomeGHS3DPLUGIN.cmake b/adm_local/cmake_files/FindSalomeGHS3DPLUGIN.cmake
index 29a0b18c615680371f4708c2a416d62255ab6162..1a3bd9f651ca4143b8795727554efad0bd414da4 100644 (file)
--- a/adm_local/cmake_files/FindSalomeGHS3DPLUGIN.cmake
+++ b/adm_local/cmake_files/FindSalomeGHS3DPLUGIN.cmake
@@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeGHS3DPLUGIN SalomeGHS3DPLUGIN CONFIG)
 IF(NOT SalomeGHS3DPLUGIN_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome GHS3DPLUGIN: ${GHS3DPLUGIN_ROOT_DIR}")
 ENDIF()
+
+FOREACH(_res ${SalomeGHS3DPLUGIN_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeGHS3DPLUGIN_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file