CMake:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fb591d919729139afb6830183bafd8408c05c2e..3f8efb07ddd294c1ae254f78343447d533d039d1 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,6 +184,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_SIERPINSKY_INSTALL_RES_DATA)
 
+# Accumulate environment variables for SIERPINSKY module
+SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
+                                                 ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON})
+SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
+
 # Sources 
 # ========
 

diff --git a/SalomeSIERPINSKYConfig.cmake.in b/SalomeSIERPINSKYConfig.cmake.in
index 201945da83efe3605c28b2121cc6845473ca7fd4..660fda2394480884aace192f95b595ca569e2235 100644 (file)
--- a/SalomeSIERPINSKYConfig.cmake.in
+++ b/SalomeSIERPINSKYConfig.cmake.in
@@ -46,6 +46,9 @@ SET_AND_CHECK(SIERPINSKY_INCLUDE_DIRS "${SIERPINSKY_ROOT_DIR_EXP}/@SALOME_INSTAL
 SET(SIERPINSKY_INCLUDE_DIRS "${SIERPINSKY_INCLUDE_DIRS};@_SalomeSIERPINSKY_EXTRA_HEADERS@")
 SET(SIERPINSKY_DEFINITIONS "@SMESH_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomeSIERPINSKY_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package:

diff --git a/adm_local/cmake_files/FindSalomeLibGd.cmake b/adm_local/cmake_files/FindSalomeLibGd.cmake
index 3698c1845202ab6e0cb6d683a5cc3265a703a145..e49066074589fb459177598c3a380e20e50ed267 100644 (file)
--- a/adm_local/cmake_files/FindSalomeLibGd.cmake
+++ b/adm_local/cmake_files/FindSalomeLibGd.cmake
@@ -20,4 +20,7 @@
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(LibGd LIBGD_INCLUDE_DIRS 1)
 MARK_AS_ADVANCED(LIBGD_INCLUDE_DIRS LIBGD_LIBRARIES)
 
-SALOME_ACCUMULATE_HEADERS(LIBGD_INCLUDE_DIRS)
+IF(LIBGD_FOUND)
+  SALOME_ACCUMULATE_HEADERS(LIBGD_INCLUDE_DIRS)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${LIBGD_LIBRARIES})
+ENDIF()

diff --git a/adm_local/cmake_files/FindSalomeSIERPINSKY.cmake b/adm_local/cmake_files/FindSalomeSIERPINSKY.cmake
index bb4aa48661e767dde2a9409b479d15344d1fd598..bfbdd1fdd44e8ebdce33951294d060415502b406 100644 (file)
--- a/adm_local/cmake_files/FindSalomeSIERPINSKY.cmake
+++ b/adm_local/cmake_files/FindSalomeSIERPINSKY.cmake
@@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeSIERPINSKY SalomeSIERPINSKY CONFIG)
 IF(NOT SalomeSIERPINSKY_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome SIERPINSKY: ${SIERPINSKY_ROOT_DIR}")
 ENDIF()
+
+FOREACH(_res ${SalomeSIERPINSKY_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeSIERPINSKY_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file