From 23f2ac4883cdf105ef147c32da7101e8967b9a3b Mon Sep 17 00:00:00 2001 From: mpa Date: Fri, 1 Nov 2013 05:16:44 +0000 Subject: [PATCH] CMake: - Accumulate environment variables, to be used later to run some command in proper environment. --- CMakeLists.txt | 4 ++++ SalomePARAVISConfig.cmake.in | 3 +++ 2 files changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01ec5895..7d0c3f3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,6 +206,10 @@ IF(NOT SALOME_LIGHT_ONLY AND NOT SALOME_PARAVIS_MINIMAL_CORBA) ENDIF() ENDIF() +# Accumulate environment variables for PARAVIS module +SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS} + ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}) +SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) # Sources # ======== diff --git a/SalomePARAVISConfig.cmake.in b/SalomePARAVISConfig.cmake.in index 0266beb6..495b8279 100644 --- a/SalomePARAVISConfig.cmake.in +++ b/SalomePARAVISConfig.cmake.in @@ -46,6 +46,9 @@ SET_AND_CHECK(PARAVIS_INCLUDE_DIRS "${PARAVIS_ROOT_DIR_EXP}/@SALOME_INSTALL_HEAD SET(PARAVIS_INCLUDE_DIRS "${PARAVIS_INCLUDE_DIRS};@_SalomePARAVIS_EXTRA_HEADERS@") SET(PARAVIS_DEFINITIONS "@KERNEL_DEFINITIONS@") +# Package specific environment variables +@_SalomePARAVIS_EXTRA_ENV_FULL@ + #### Now the specificities # Options exported by the package: -- 2.39.2