From 9ab593854c059f41c94ee3bbc405b7cb9359bea4 Mon Sep 17 00:00:00 2001 From: mpa Date: Wed, 30 Oct 2013 06:20:09 +0000 Subject: [PATCH] CMake: - Accumulate environment variables, to be used later to run some command in proper environment. --- CMakeLists.txt | 4 ++++ SalomeGHS3DPLUGINConfig.cmake.in | 3 +++ adm_local/cmake_files/FindSalomeGHS3DPLUGIN.cmake | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 802a2f9..80d333f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,6 +183,10 @@ MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED) MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC) MARK_AS_ADVANCED(SALOME_GHS3DPLUGIN_INSTALL_RES_DATA) +# Accumulate environment variables for GHS3DPLUGIN 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/SalomeGHS3DPLUGINConfig.cmake.in b/SalomeGHS3DPLUGINConfig.cmake.in index b6e7c8f..c663f1b 100644 --- a/SalomeGHS3DPLUGINConfig.cmake.in +++ b/SalomeGHS3DPLUGINConfig.cmake.in @@ -46,6 +46,9 @@ SET_AND_CHECK(GHS3DPLUGIN_INCLUDE_DIRS "${GHS3DPLUGIN_ROOT_DIR_EXP}/@SALOME_INST SET(GHS3DPLUGIN_INCLUDE_DIRS "${GHS3DPLUGIN_INCLUDE_DIRS};@_SalomeGHS3DPLUGIN_EXTRA_HEADERS@") SET(GHS3DPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@") +# Package specific environment variables +@_SalomeGHS3DPLUGIN_EXTRA_ENV_FULL@ + #### Now the specificities # Options exported by the package: diff --git a/adm_local/cmake_files/FindSalomeGHS3DPLUGIN.cmake b/adm_local/cmake_files/FindSalomeGHS3DPLUGIN.cmake index 29a0b18..1a3bd9f 100644 --- a/adm_local/cmake_files/FindSalomeGHS3DPLUGIN.cmake +++ b/adm_local/cmake_files/FindSalomeGHS3DPLUGIN.cmake @@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeGHS3DPLUGIN SalomeGHS3DPLUGIN CONFIG) IF(NOT SalomeGHS3DPLUGIN_FIND_QUIETLY) MESSAGE(STATUS "Found Salome GHS3DPLUGIN: ${GHS3DPLUGIN_ROOT_DIR}") ENDIF() + +FOREACH(_res ${SalomeGHS3DPLUGIN_EXTRA_ENV}) + SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeGHS3DPLUGIN_EXTRA_ENV_${_res}}") +ENDFOREACH() \ No newline at end of file -- 2.39.2