From a4b0846ec7e703bfa4c254c87595142c70c32d60 Mon Sep 17 00:00:00 2001 From: mpa Date: Thu, 31 Oct 2013 07:41:18 +0000 Subject: [PATCH] CMake: Edition accumulation of LD_LIBRARY_PATH and PATH --- salome_adm/cmake_files/FindSalomePython.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/salome_adm/cmake_files/FindSalomePython.cmake b/salome_adm/cmake_files/FindSalomePython.cmake index b6f77ffa5..13adbcdb0 100644 --- a/salome_adm/cmake_files/FindSalomePython.cmake +++ b/salome_adm/cmake_files/FindSalomePython.cmake @@ -150,7 +150,7 @@ IF (SALOMEPYTHON_FOUND) ## 6. Save the final detected installation ## SET(PYTHON_ROOT_DIR "${_tmp_ROOT_DIR}") - SALOME_ACCUMULATE_HEADERS(PYTHON_INCLUDE_DIR) + SET(PYTHON_PYTHONPATH "${_tmp_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") ## 7. Specifics ## @@ -174,7 +174,8 @@ ELSE() ENDIF() IF(SALOMEPYTHON_FOUND) - #SALOME_ACCUMULATE_HEADERS(PYTHON_INCLUDE_DIR) + SALOME_ACCUMULATE_HEADERS(PYTHON_INCLUDE_DIR) + SALOME_ACCUMULATE_ENVIRONMENT(PATH ${PYTHON_EXECUTABLE}) SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PYTHON_LIBRARIES}) - SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PYTHON_LIBRARIES}) + SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PYTHON_PYTHONPATH}) ENDIF() -- 2.30.2