From f4bad13677c94064b98b1048b7764f72c11ed2fa Mon Sep 17 00:00:00 2001 From: abn Date: Tue, 9 Feb 2016 13:55:27 +0100 Subject: [PATCH] Further fix for the Python detection split. --- salome_adm/cmake_files/FindSalomePythonInterp.cmake | 2 +- salome_adm/cmake_files/FindSalomePythonLibs.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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) -- 2.39.2