From 2c8f9522d3d52b741ed6e568eccea7009fab50b8 Mon Sep 17 00:00:00 2001 From: mpa Date: Tue, 29 Oct 2013 14:00:18 +0000 Subject: [PATCH] CMake: - Accumulate environment variables, to be used later to run some command in proper environment. --- CMakeLists.txt | 5 +++++ SalomeBLSURFPLUGINConfig.cmake.in | 3 +++ 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5333e34..4a3a99a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,6 +186,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_BLSURFPLUGIN_INSTALL_RES_DATA SALOME_BLSURFPLUGIN_INSTALL_TESTS) +# Accumulate environment variables for BLSURFPLUGIN 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/SalomeBLSURFPLUGINConfig.cmake.in b/SalomeBLSURFPLUGINConfig.cmake.in index 94f92fe..5b28ef0 100644 --- a/SalomeBLSURFPLUGINConfig.cmake.in +++ b/SalomeBLSURFPLUGINConfig.cmake.in @@ -46,6 +46,9 @@ SET_AND_CHECK(BLSURFPLUGIN_INCLUDE_DIRS "${BLSURFPLUGIN_ROOT_DIR_EXP}/@SALOME_IN SET(BLSURFPLUGIN_INCLUDE_DIRS "${BLSURFPLUGIN_INCLUDE_DIRS};@_SalomeBLSURFPLUGIN_EXTRA_HEADERS@") SET(BLSURFPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@") +# Package specific environment variables +@_SalomeBLSURFPLUGIN_EXTRA_ENV_FULL@ + #### Now the specificities # Options exported by the package: -- 2.39.2