CMake:

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

diff --git a/adm_local/cmake_files/FindSalomeBLSURFPLUGIN.cmake b/adm_local/cmake_files/FindSalomeBLSURFPLUGIN.cmake
index f84c5a285942afd017c1f7c2b4d5bd74962b02be..b547b96c96f774b015f4450a14ad631686275d02 100644 (file)
--- a/adm_local/cmake_files/FindSalomeBLSURFPLUGIN.cmake
+++ b/adm_local/cmake_files/FindSalomeBLSURFPLUGIN.cmake
@@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeBLSURFPLUGIN SalomeBLSURFPLUGIN CONFIG)
 IF(NOT SalomeBLSURFPLUGIN_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome BLSURFPLUGIN: ${BLSURFPLUGIN_ROOT_DIR}")
 ENDIF()
+
+FOREACH(_res ${SalomeBLSURFPLUGIN_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeBLSURFPLUGIN_EXTRA_ENV_${_res}}")
+ENDFOREACH()

diff --git a/adm_local/cmake_files/FindSalomeMESHGEMS.cmake b/adm_local/cmake_files/FindSalomeMESHGEMS.cmake
index 1718011ce26eb107e862bebc4bb72fcdef228c71..e03ec02be68d98d681229a077414df483b1d26f5 100644 (file)
--- a/adm_local/cmake_files/FindSalomeMESHGEMS.cmake
+++ b/adm_local/cmake_files/FindSalomeMESHGEMS.cmake
@@ -20,4 +20,7 @@
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MESHGEMS MESHGEMS_INCLUDE_DIRS 1)
 MARK_AS_ADVANCED(MESHGEMS_INCLUDE_DIRS MESHGEMS_LIBRARIES)
 
-SALOME_ACCUMULATE_HEADERS(MESHGEMS_INCLUDE_DIRS)
+IF(MESHGEMS_FOUND)
+  SALOME_ACCUMULATE_HEADERS(MESHGEMS_INCLUDE_DIRS)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${MESHGEMS_LIBRARIES})
+ENDIF()