From: mpa Date: Thu, 31 Oct 2013 12:41:18 +0000 (+0000) Subject: CMake: X-Git-Tag: V7_3_0a1~44 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c1cac07712c7c26ab452f85317240d731ec19296;p=modules%2Fyacs.git CMake: - Accumulate environment variables, to be used later to run some command in proper environment. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index c109baa44..ec1e51cf1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -234,6 +234,11 @@ MARK_AS_ADVANCED( SALOME_INSTALL_HXX2SALOME ) +# Accumulate environment variables for YACS 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 # ======== IF(SALOME_YACS_USE_KERNEL AND NOT SALOME_LIGHT_ONLY) diff --git a/SalomeYACSConfig.cmake.in b/SalomeYACSConfig.cmake.in index 454f237ab..c398c4c02 100644 --- a/SalomeYACSConfig.cmake.in +++ b/SalomeYACSConfig.cmake.in @@ -46,6 +46,9 @@ SET_AND_CHECK(YACS_INCLUDE_DIRS "${YACS_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") SET(YACS_INCLUDE_DIRS "${YACS_INCLUDE_DIRS};@_SalomeYACS_EXTRA_HEADERS@") SET(YACS_DEFINITIONS) +# Package specific environment variables +@_SalomeYACS_EXTRA_ENV_FULL@ + #### Now the specificities # Options exported by the package: