From 1e7248527b967ede059ea061043b06c2017e8ec7 Mon Sep 17 00:00:00 2001 From: mpa Date: Wed, 30 Oct 2013 06:24:30 +0000 Subject: [PATCH] CMake: - Accumulate environment variables, to be used later to run some command in proper environment. --- CMakeLists.txt | 5 +++++ SalomeGHS3DPRLPLUGINConfig.cmake.in | 3 +++ adm_local/cmake_files/FindSalomeGHS3DPRLPLUGIN.cmake | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec651cc..a4046a1 100755 --- 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_GHS3DPRLPLUGIN_INSTALL_RES_DATA) +# Accumulate environment variables for GHS3DPRLPLUGIN module +SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS} + ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}) +SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) + # Sources # ======== diff --git a/SalomeGHS3DPRLPLUGINConfig.cmake.in b/SalomeGHS3DPRLPLUGINConfig.cmake.in index 5abc5e9..69865d0 100644 --- a/SalomeGHS3DPRLPLUGINConfig.cmake.in +++ b/SalomeGHS3DPRLPLUGINConfig.cmake.in @@ -46,6 +46,9 @@ SET_AND_CHECK(GHS3DPRLPLUGIN_INCLUDE_DIRS "${GHS3DPRLPLUGIN_ROOT_DIR_EXP}/@SALOM SET(GHS3DPRLPLUGIN_INCLUDE_DIRS "${GHS3DPRLPLUGIN_INCLUDE_DIRS};@_SalomeGHS3DPRLPLUGIN_EXTRA_HEADERS@") SET(GHS3DPRLPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@") +# Package specific environment variables +@_SalomeGHS3DPRLPLUGIN_EXTRA_ENV_FULL@ + #### Now the specificities # Options exported by the package: diff --git a/adm_local/cmake_files/FindSalomeGHS3DPRLPLUGIN.cmake b/adm_local/cmake_files/FindSalomeGHS3DPRLPLUGIN.cmake index b766fc7..e7d79b4 100644 --- a/adm_local/cmake_files/FindSalomeGHS3DPRLPLUGIN.cmake +++ b/adm_local/cmake_files/FindSalomeGHS3DPRLPLUGIN.cmake @@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeGHS3DPRLPLUGIN SalomeGHS3DPRLPLUGIN CONFIG) IF(NOT SalomeGHS3DPLUGIN_FIND_QUIETLY) MESSAGE(STATUS "Found Salome GHS3DPRLPLUGIN: ${GHS3DPRLPLUGIN_ROOT_DIR}") ENDIF() + +FOREACH(_res ${SalomeGHS3DPRLPLUGIN_EXTRA_ENV}) + SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeGHS3DPRLPLUGIN_EXTRA_ENV_${_res}}") +ENDFOREACH() -- 2.39.2