caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #313 from xobs/fix-string-quoting

Browse Source 
cmakelists: quote the last argument to REGEX REPLACE
This commit is contained in:
David Shah 2019-08-14 18:33:04 +01:00 committed by GitHub
commit 541451dc62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -136,18 +136,18 @@ if (BUILD_PYTHON)
# Original source: https://github.com/BVLC/caffe/blob/master/cmake/Dependencies.cmake#L148 # Original source: https://github.com/BVLC/caffe/blob/master/cmake/Dependencies.cmake#L148
set(version ${PYTHONLIBS_VERSION_STRING}) set(version ${PYTHONLIBS_VERSION_STRING})
STRING(REGEX REPLACE "[^0-9]" "" boost_py_version ${version}) STRING(REGEX REPLACE "[^0-9]" "" boost_py_version "${version}")
find_package(Boost QUIET COMPONENTS "python-py${boost_py_version}" ${boost_libs}) find_package(Boost QUIET COMPONENTS "python-py${boost_py_version}" ${boost_libs})
set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND}) set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
while (NOT "${version}" STREQUAL "" AND NOT Boost_PYTHON_FOUND) while (NOT "${version}" STREQUAL "" AND NOT Boost_PYTHON_FOUND)
STRING(REGEX REPLACE "([0-9.]+).[0-9]+" "\\1" version ${version}) STRING(REGEX REPLACE "([0-9.]+).[0-9]+" "\\1" version "${version}")
STRING(REGEX REPLACE "[^0-9]" "" boost_py_version ${version}) STRING(REGEX REPLACE "[^0-9]" "" boost_py_version "${version}")
find_package(Boost QUIET COMPONENTS "python-py${boost_py_version}" ${boost_libs}) find_package(Boost QUIET COMPONENTS "python-py${boost_py_version}" ${boost_libs})
set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND}) set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
STRING(REGEX MATCHALL "([0-9.]+).[0-9]+" has_more_version ${version}) STRING(REGEX MATCHALL "([0-9.]+).[0-9]+" has_more_version "${version}")
if ("${has_more_version}" STREQUAL "") if ("${has_more_version}" STREQUAL "")
break() break()
endif () endif ()
@ -175,7 +175,7 @@ if (BUILD_PYTHON)
endif () endif ()
if (NOT Boost_PYTHON_FOUND) if (NOT Boost_PYTHON_FOUND)
STRING(REGEX REPLACE "([0-9]+\\.[0-9]+).*" "\\1" gentoo_version ${PYTHONLIBS_VERSION_STRING}) STRING(REGEX REPLACE "([0-9]+\\.[0-9]+).*" "\\1" gentoo_version "${PYTHONLIBS_VERSION_STRING}")
find_package(Boost QUIET COMPONENTS python-${gentoo_version} ${boost_libs}) find_package(Boost QUIET COMPONENTS python-${gentoo_version} ${boost_libs})
if ("${Boost_LIBRARIES}" MATCHES ".*(python|PYTHON).*" ) if ("${Boost_LIBRARIES}" MATCHES ".*(python|PYTHON).*" )
set(Boost_PYTHON_FOUND TRUE) set(Boost_PYTHON_FOUND TRUE)