From e2a993a4de5952ef1d2698328da61aef797004ae Mon Sep 17 00:00:00 2001 From: mpa Date: Thu, 31 Oct 2013 11:30:23 +0000 Subject: [PATCH] CMake: - Accumulate environment variables, to be used later to run some command in proper environment. --- adm_local/cmake_files/FindSalomeBLSURFPLUGIN.cmake | 4 ++++ adm_local/cmake_files/FindSalomeMESHGEMS.cmake | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) 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() -- 2.39.2