CMake: Edition accumulation of LD_LIBRARY_PATH and PATH

[modules/yacs.git] / salome_adm / cmake_files / FindSalomePython.cmake

diff --git a/salome_adm/cmake_files/FindSalomePython.cmake b/salome_adm/cmake_files/FindSalomePython.cmake
index b6f77ffa56bfc05d7c5807f45ad04e1aadd1dfb7..13adbcdb0cb89eefee4fd2e8d13337710d1a9c0e 100644 (file)
--- 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()