Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strip pythonlibs version string of possible other characters than 0-9 and . (e.g. '+')

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1215 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Isaak Lim
2015-02-03 10:23:06 +00:00
parent bf69130780
commit 0d4abeb2c3
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Python/CMakeLists.txt
View File

@@ -24,26 +24,10 @@ IF(OPENMESH_BUILD_PYTHON_BINDINGS)
SET(BOOST_PYTHON_COMPONENT "python-py${PYTHON_VERSION}") SET(BOOST_PYTHON_COMPONENT "python-py${PYTHON_VERSION}")
# Check known boost versions for the python component
SET(BOOST_KNOWN_VERSIONS
"1.56.0" "1.56" "1.55.0" "1.55" "1.54.0" "1.54"
"1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
"1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1"
"1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42"
"1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
"1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
"1.34" "1.33.1" "1.33.0" "1.33"
)
MESSAGE(STATUS "Looking for Boost Python") MESSAGE(STATUS "Looking for Boost Python")
# Look for python component # Look for python component
FOREACH(VERSION ${BOOST_KNOWN_VERSIONS}) FIND_PACKAGE(Boost QUIET COMPONENTS ${BOOST_PYTHON_COMPONENT} REQUIRED)
IF(Boost_FOUND)
BREAK()
ENDIF()
FIND_PACKAGE(Boost ${VERSION} EXACT QUIET COMPONENTS python)
ENDFOREACH()
IF(Boost_FOUND) IF(Boost_FOUND)
MESSAGE(STATUS "Looking for Boost Python -- found") MESSAGE(STATUS "Looking for Boost Python -- found")
@@ -62,7 +46,10 @@ IF(OPENMESH_BUILD_PYTHON_BINDINGS)
IF(COMPILE_WORKS) IF(COMPILE_WORKS)
# Look for the python interpreter to check if the example works # Look for the python interpreter to check if the example works
FIND_PACKAGE(PythonInterp ${PYTHONLIBS_VERSION_STRING} QUIET)
# strip version string of any characters (e.g. # '+') than 0-9 and .
STRING(REGEX REPLACE "[^ 0-9 | \\.]" "" PYTHONLIBS_VERSION_STRING_STRIPPED ${PYTHONLIBS_VERSION_STRING})
FIND_PACKAGE(PythonInterp ${PYTHONLIBS_VERSION_STRING_STRIPPED} QUIET)
IF(PYTHONINTERP_FOUND) IF(PYTHONINTERP_FOUND)
EXECUTE_PROCESS( EXECUTE_PROCESS(