From: rnv Date: Thu, 17 Mar 2016 13:15:19 +0000 (+0300) Subject: Search python libraries with same version as python interpreter version X-Git-Tag: V7_8_0a2~6 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f4b3de5a281cc72515e3417397fe3b040c5e8c5c;p=modules%2Fkernel.git Search python libraries with same version as python interpreter version --- diff --git a/salome_adm/cmake_files/FindSalomePythonLibs.cmake b/salome_adm/cmake_files/FindSalomePythonLibs.cmake index c2e6d58bd..06e87aae5 100644 --- a/salome_adm/cmake_files/FindSalomePythonLibs.cmake +++ b/salome_adm/cmake_files/FindSalomePythonLibs.cmake @@ -31,6 +31,10 @@ IF(EXISTS "${PYTHON_ROOT_DIR}" AND (NOT PYTHONLIBS_ROOT_DIR)) MESSAGE(STATUS "Setting PYTHONLIBS_ROOT_DIR to: ${PYTHON_ROOT_DIR}") SET(PYTHONLIBS_ROOT_DIR "${PYTHON_ROOT_DIR}" CACHE PATH "Path to PythonLibs directory") ENDIF() +IF (SALOMEPYTHONINTERP_FOUND AND NOT "${PYTHON_VERSION_STRING}" STREQUAL "") + # Trying to search libraries with same version as an interpreter version + SET(PythonLibs_FIND_VERSION ${PYTHON_VERSION_STRING}) +ENDIF() SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(PythonLibs PYTHON_INCLUDE_DIR 2) IF(SALOMEPYTHONLIBS_FOUND)