From bffb7f1f0fdab8f8b132a3228b1dad5290a85d40 Mon Sep 17 00:00:00 2001 From: mpa Date: Thu, 31 Oct 2013 12:13:16 +0000 Subject: [PATCH] CMake: - Accumulate environment variables, to be used later to run some command in proper environment. --- CMakeLists.txt | 3 +++ SalomePYLIGHTConfig.cmake.in | 3 +++ adm_local/cmake_files/FindSalomePYLIGHT.cmake | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 680df94..bbd7ef5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,6 +120,9 @@ MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED) MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC) MARK_AS_ADVANCED(SALOME_PYLIGHT_INSTALL_RES_DATA) +# Accumulate environment variables for PYLIGHT module +SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}) + # Sources # ======== diff --git a/SalomePYLIGHTConfig.cmake.in b/SalomePYLIGHTConfig.cmake.in index a8331f6..65a1c72 100644 --- a/SalomePYLIGHTConfig.cmake.in +++ b/SalomePYLIGHTConfig.cmake.in @@ -40,6 +40,9 @@ SET_AND_CHECK(PYLIGHT_INCLUDE_DIRS "${PYLIGHT_ROOT_DIR_EXP}/@SALOME_INSTALL_HEAD SET(PYLIGHT_INCLUDE_DIRS "${PYLIGHT_INCLUDE_DIRS};@_SalomePYLIGHT_EXTRA_HEADERS@") SET(PYLIGHT_DEFINITIONS "@GUI_DEFINITIONS@") +# Package specific environment variables +@_SalomePYLIGHT_EXTRA_ENV_FULL@ + # Load the dependencies for the libraries of @PROJECT_NAME@ # (contains definitions for IMPORTED targets). This is only # imported if we are not built as a subproject (in this case targets are already there) diff --git a/adm_local/cmake_files/FindSalomePYLIGHT.cmake b/adm_local/cmake_files/FindSalomePYLIGHT.cmake index 2f93a75..65b323a 100644 --- a/adm_local/cmake_files/FindSalomePYLIGHT.cmake +++ b/adm_local/cmake_files/FindSalomePYLIGHT.cmake @@ -27,4 +27,8 @@ SALOME_FIND_PACKAGE(SalomePYLIGHT SalomePYLIGHT CONFIG) IF(NOT SalomePYLIGHT_FIND_QUIETLY) MESSAGE(STATUS "Found Salome PYLIGHT: ${PYLIGHT_ROOT_DIR}") -ENDIF() \ No newline at end of file +ENDIF() + +FOREACH(_res ${SalomePYLIGHT_EXTRA_ENV}) + SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomePYLIGHT_EXTRA_ENV_${_res}}") +ENDFOREACH() \ No newline at end of file -- 2.39.2