From: mnt Date: Mon, 21 Mar 2016 18:25:40 +0000 (+0300) Subject: Synchronize adm files X-Git-Tag: V7_8_0a2~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ad0eb3dfdd49bc7ba2ce4abc67ed7276791966f7;p=tools%2Fdocumentation.git Synchronize adm files --- diff --git a/CMakeModules/FindSalomePythonLibs.cmake b/CMakeModules/FindSalomePythonLibs.cmake index c2e6d58..06e87aa 100644 --- a/CMakeModules/FindSalomePythonLibs.cmake +++ b/CMakeModules/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)