CMake:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de6b16e433c85e0bed45b128808ac3bd7266d5d9..85dabe1baf1a1477f1d4407655e59102c9b98f5e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,6 +188,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_NETGENPLUGIN_INSTALL_RES_DATA)
 
+# Accumulate environment variables for NETGENPLUGIN 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/SalomeNETGENPLUGINConfig.cmake.in b/SalomeNETGENPLUGINConfig.cmake.in
index b1ce05438658fbc869a70a1aebd088992fc4833b..cda17a98afcf3a7dde89dc9dcaaf5cfba8861837 100644 (file)
--- a/SalomeNETGENPLUGINConfig.cmake.in
+++ b/SalomeNETGENPLUGINConfig.cmake.in
@@ -46,6 +46,9 @@ SET_AND_CHECK(NETGENPLUGIN_INCLUDE_DIRS "${NETGENPLUGIN_ROOT_DIR_EXP}/@SALOME_IN
 SET(NETGENPLUGIN_INCLUDE_DIRS "${NETGENPLUGIN_INCLUDE_DIRS};@_SalomeNETGENPLUGIN_EXTRA_HEADERS@")
 SET(NETGENPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomeNETGENPLUGIN_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package:

diff --git a/adm_local/cmake_files/FindSalomeNETGENPLUGIN.cmake b/adm_local/cmake_files/FindSalomeNETGENPLUGIN.cmake
index ff619eeb63671842277630a0309aa6b13bf345d0..29bfcc4f4abf637c837b393f0045120f481a3a27 100644 (file)
--- a/adm_local/cmake_files/FindSalomeNETGENPLUGIN.cmake
+++ b/adm_local/cmake_files/FindSalomeNETGENPLUGIN.cmake
@@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeNETGENPLUGIN SalomeNETGENPLUGIN CONFIG)
 IF(NOT SalomeNETGENPLUGIN_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome NETGENPLUGIN: ${NETGENPLUGIN_ROOT_DIR}")
 ENDIF()
+
+FOREACH(_res ${SalomeNETGENPLUGIN_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeNETGENPLUGIN_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file

diff --git a/adm_local/cmake_files/FindSalomeNetgen.cmake b/adm_local/cmake_files/FindSalomeNetgen.cmake
index 42b51bc0d0fa6a0d431f43b415d4968e748258dd..27c0d17f54603b7929647ffb2f7af7fc02b60ea9 100644 (file)
--- a/adm_local/cmake_files/FindSalomeNetgen.cmake
+++ b/adm_local/cmake_files/FindSalomeNetgen.cmake
@@ -20,4 +20,7 @@
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Netgen NETGEN_INCLUDE_DIRS 1)
 MARK_AS_ADVANCED(NETGEN_INCLUDE_DIRS NETGEN_LIBRARIES)
 
-SALOME_ACCUMULATE_HEADERS(NETGEN_INCLUDE_DIRS)
+IF(NETGEN_FOUND)
+  SALOME_ACCUMULATE_HEADERS(NETGEN_INCLUDE_DIRS)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${NETGEN_LIBRARIES})
+ENDIF()