CMake:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d96492d8db41d9c29480b7c2199c741c754dbedd..412043eb9898c2e7982b2b81e1c7d87bf2fbb8d8 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,6 +184,12 @@ MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED)
 MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC)
 MARK_AS_ADVANCED(SALOME_HOMARD_INSTALL_RES_DATA)
 
+# Accumulate environment variables for HOMARD module
+SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
+                                                 ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}
+                                                 ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON_SHARED})
+SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
+                                              
 # Sources 
 # ========
 

diff --git a/SalomeHOMARDConfig.cmake.in b/SalomeHOMARDConfig.cmake.in
index 8e57d60bab496de623c96cbfb2fb7be697f7ee2f..a983e1abc1fc2fc5dd61df4b71f03ac448dd52eb 100644 (file)
--- a/SalomeHOMARDConfig.cmake.in
+++ b/SalomeHOMARDConfig.cmake.in
@@ -46,6 +46,9 @@ SET_AND_CHECK(HOMARD_INCLUDE_DIRS "${HOMARD_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADER
 SET(HOMARD_INCLUDE_DIRS "${HOMARD_INCLUDE_DIRS};@_SalomeHOMARD_EXTRA_HEADERS@")
 SET(HOMARD_DEFINITIONS "@SMESH_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomeHOMARD_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package:

diff --git a/adm_local/cmake_files/FindSalomeHOMARD.cmake b/adm_local/cmake_files/FindSalomeHOMARD.cmake
index 27e35796a319ddb0e6ed82d88cec44d1de2ef505..64d655c47ea37c9c09a7565e60187d30fbd976d6 100644 (file)
--- a/adm_local/cmake_files/FindSalomeHOMARD.cmake
+++ b/adm_local/cmake_files/FindSalomeHOMARD.cmake
@@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeHOMARD SalomeHOMARD CONFIG)
 IF(NOT SalomeHOMARD_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome HOMARD: ${HOMARD_ROOT_DIR}")
 ENDIF()
+
+FOREACH(_res ${SalomeHOMARD_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeHOMARD_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file