зеркало из https://github.com/microsoft/caffe.git
CMake python version fix
This commit is contained in:
Родитель
b23e9b1b21
Коммит
672f30ece3
|
@ -114,14 +114,14 @@ if(BUILD_python)
|
|||
# Find the matching boost python implementation
|
||||
set(version ${PYTHONLIBS_VERSION_STRING})
|
||||
|
||||
STRING( REPLACE "." "" boost_py_version ${version} )
|
||||
STRING( REGEX REPLACE "[^0-9]" "" boost_py_version ${version} )
|
||||
find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
|
||||
set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
|
||||
|
||||
while(NOT "${version}" STREQUAL "" AND NOT Boost_PYTHON_FOUND)
|
||||
STRING( REGEX REPLACE "([0-9.]+).[0-9]+" "\\1" version ${version} )
|
||||
|
||||
STRING( REPLACE "." "" boost_py_version ${version} )
|
||||
STRING( REGEX REPLACE "[^0-9]" "" boost_py_version ${version} )
|
||||
find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
|
||||
set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче