From: abn Date: Tue, 9 Feb 2016 12:55:27 +0000 (+0100) Subject: Further fix for the Python detection split. X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fabn%2Ffind_py;p=modules%2Fkernel.git Further fix for the Python detection split. --- diff --git a/salome_adm/cmake_files/FindSalomePythonInterp.cmake b/salome_adm/cmake_files/FindSalomePythonInterp.cmake index 3e85a0152..9028f26ce 100644 --- a/salome_adm/cmake_files/FindSalomePythonInterp.cmake +++ b/salome_adm/cmake_files/FindSalomePythonInterp.cmake @@ -39,7 +39,7 @@ SET(PYTHON_ROOT_DIR "$ENV{PYTHON_ROOT_DIR}" CACHE PATH "Path to the Python insta IF(EXISTS "${PYTHON_ROOT_DIR}" AND (NOT PYTHONINTERP_ROOT_DIR)) # Extract sub-directory "paraview-x.xx": MESSAGE(STATUS "Setting PYTHONINTERP_ROOT_DIR to: ${PYTHON_ROOT_DIR}") - SET(PYTHONINTERP_ROOT_DIR "${PYTHON_ROOT_DIR}") + SET(PYTHONINTERP_ROOT_DIR "${PYTHON_ROOT_DIR}" CACHE PATH "Path to PythonInterp directory") ENDIF() SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(PythonInterp PYTHON_EXECUTABLE 1) diff --git a/salome_adm/cmake_files/FindSalomePythonLibs.cmake b/salome_adm/cmake_files/FindSalomePythonLibs.cmake index 7d4776949..427786ed9 100644 --- a/salome_adm/cmake_files/FindSalomePythonLibs.cmake +++ b/salome_adm/cmake_files/FindSalomePythonLibs.cmake @@ -29,7 +29,7 @@ SET(PYTHON_ROOT_DIR "$ENV{PYTHON_ROOT_DIR}" CACHE PATH "Path to the Python insta IF(EXISTS "${PYTHON_ROOT_DIR}" AND (NOT PYTHONLIBS_ROOT_DIR)) # Extract sub-directory "paraview-x.xx": MESSAGE(STATUS "Setting PYTHONLIBS_ROOT_DIR to: ${PYTHON_ROOT_DIR}") - SET(PYTHONLIBS_ROOT_DIR "${PYTHON_ROOT_DIR}") + SET(PYTHONLIBS_ROOT_DIR "${PYTHON_ROOT_DIR}" CACHE PATH "Path to PythonLibs directory") ENDIF() SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(PythonLibs PYTHON_INCLUDE_DIR 2)