CMake:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27bfe679bb63119a47ed61c06a76bb20eb0c806c..75e0292ca9d5ff0b151a96c0f6aa08caeebe75be 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,6 +128,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_ATOMGEN_INSTALL_RES_DATA)
 
+# Accumulate environment variables for ATOMGEN 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}) 
+                                              
 ADD_SUBDIRECTORY(idl)
 ADD_SUBDIRECTORY(adm_local)
 ADD_SUBDIRECTORY(resources)

diff --git a/SalomeATOMGENConfig.cmake.in b/SalomeATOMGENConfig.cmake.in
index d60cebb12b317ab10e9b1a21f7a59745c5fad3b9..0c993427cc08fe80ba69918df66d731de8e6077c 100644 (file)
--- a/SalomeATOMGENConfig.cmake.in
+++ b/SalomeATOMGENConfig.cmake.in
@@ -46,6 +46,9 @@ SET_AND_CHECK(ATOMGEN_INCLUDE_DIRS "${ATOMGEN_ROOT_DIR_EXP}/@SALOME_INSTALL_HEAD
 SET(ATOMGEN_INCLUDE_DIRS "${ATOMGEN_INCLUDE_DIRS};@_SalomeATOMGEN_EXTRA_HEADERS@")
 SET(ATOMGEN_DEFINITIONS "@GUI_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomeATOMGEN_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package:

diff --git a/adm_local/cmake_files/FindSalomeATOMGEN.cmake b/adm_local/cmake_files/FindSalomeATOMGEN.cmake
index 8439261833a926d6fe0e4a1391bb36095ec4d825..01ff9d1b38582c91af25aebb6e78fe0ac0dd133d 100644 (file)
--- a/adm_local/cmake_files/FindSalomeATOMGEN.cmake
+++ b/adm_local/cmake_files/FindSalomeATOMGEN.cmake
@@ -27,4 +27,8 @@ SALOME_FIND_PACKAGE(SalomeATOMGEN SalomeATOMGEN CONFIG)
 
 IF(NOT SalomeATOMGEN_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome ATOMGEN: ${ATOMGEN_ROOT_DIR}")
-ENDIF()
\ No newline at end of file
+ENDIF()
+
+FOREACH(_res ${SalomeATOMGEN_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeATOMGEN_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file