From: mpa <mpa@opencascade.com>
Date: Thu, 31 Oct 2013 11:30:23 +0000 (+0000)
Subject: CMake:
X-Git-Tag: V7_3_0a1~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e2a993a4de5952ef1d2698328da61aef797004ae;p=plugins%2Fblsurfplugin.git

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 f84c5a2..b547b96 100644
--- 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 1718011..e03ec02 100644
--- 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()