From: abn Date: Wed, 10 Feb 2016 09:24:47 +0000 (+0100) Subject: Sync with KERNEL X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7167db59d4746b7f669ff52968cd72c1efde3621;p=tools%2Fmedcoupling.git Sync with KERNEL --- diff --git a/cmake_files/FindSalomePythonInterp.cmake b/cmake_files/FindSalomePythonInterp.cmake index 3e85a0152..9028f26ce 100644 --- a/cmake_files/FindSalomePythonInterp.cmake +++ b/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/cmake_files/FindSalomePythonLibs.cmake b/cmake_files/FindSalomePythonLibs.cmake index 7d4776949..427786ed9 100644 --- a/cmake_files/FindSalomePythonLibs.cmake +++ b/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)