From: mpa <mpa@opencascade.com>
Date: Tue, 29 Oct 2013 10:27:31 +0000 (+0000)
Subject: CMake:
X-Git-Tag: V7_3_0a1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?p=samples%2Fatomgen.git;a=commitdiff_plain;h=7ec4dc4d80a6e72131903cdf5bd45867dd7a282b

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27bfe67..75e0292 100755
--- 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 d60cebb..0c99342 100644
--- 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 8439261..01ff9d1 100644
--- 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