Mentions légales du service

Skip to content
Snippets Groups Projects
Commit ffc466c6 authored by hhakim's avatar hhakim
Browse files

Fix issue #229. PY3_MINOR_VER wrongly set for python3.10.

parent 36a30d45
No related branches found
No related tags found
No related merge requests found
Pipeline #834022 skipped
......@@ -380,13 +380,13 @@ list(LENGTH CYTHON_EXES CYTHON_EXES_LEN)
#message(STATUS "CYTHON_EXES_LEN=${CYTHON_EXES_LEN}, CYTHON_EXES=${CYTHON_EXES}")
if(UNIX)
foreach(PYTHON_EXE IN LISTS PYTHON_EXES)
exec_program("${PYTHON_EXE}" ARGS "--version" OUTPUT_VARIABLE PY_VER RETURN_VALUE PY_RES)
exec_program("${PYTHON_EXE}" ARGS "--version" OUTPUT_VARIABLE PY_VER_ RETURN_VALUE PY_RES)
#message(STATUS "PY_VER=${PY_VER}")
string(REGEX REPLACE "Python ([0-9]\\.[0-9]).*$" "\\1" PY_VER_WITH_POINTS ${PY_VER})
string(REGEX REPLACE "Python ([0-9])\\.([0-9]).*$" "\\1\\2" PY_VER ${PY_VER})
string(REGEX REPLACE "Python ([0-9]\\.[0-9]+).*$" "\\1" PY_VER_WITH_POINTS ${PY_VER_})
string(REGEX REPLACE "Python ([0-9])\\.([0-9]+).*$" "\\1\\2" PY_VER ${PY_VER_})
if(PY_VER MATCHES 3)
set(PY3_VER ${PY_VER_WITH_POINTS} PARENT_SCOPE)
string(REGEX REPLACE ".*([0-9])$" "\\1" PY3_MINOR_VER ${PY_VER})
string(REGEX REPLACE "Python ([0-9])\\.([0-9]+).*$" "\\2" PY3_MINOR_VER ${PY_VER_})
set(PY3_MINOR_VER ${PY3_MINOR_VER} PARENT_SCOPE)
endif()
add_custom_command(TARGET ${FAUST_PYTHON_TARGET}
......@@ -411,10 +411,10 @@ if(UNIX)
elseif(WIN32)
if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
foreach(PYTHON_EXE IN LISTS PYTHON_EXES)
exec_program("${PYTHON_EXE}" ARGS "--version" OUTPUT_VARIABLE PY_VER RETURN_VALUE PY_RES)
exec_program("${PYTHON_EXE}" ARGS "--version" OUTPUT_VARIABLE PY_VER_ RETURN_VALUE PY_RES)
#message(STATUS "PY_VER=${PY_VER}")
string(REGEX REPLACE "Python ([0-9]\\.[0-9]).*$" "\\1" PY_VER_WITH_POINTS ${PY_VER})
string(REGEX REPLACE "Python ([0-9])\\.([0-9]).*$" "\\1\\2" PY_VER ${PY_VER})
string(REGEX REPLACE "Python ([0-9]\\.[0-9]+).*$" "\\1" PY_VER_WITH_POINTS ${PY_VER_})
string(REGEX REPLACE "Python ([0-9])\\.([0-9]+).*$" "\\1\\2" PY_VER ${PY_VER_})
# ONLY Python 3 for Faust built with Visual Studio
if(PY_VER MATCHES 3)
set(PY3_VER ${PY_VER_WITH_POINTS} PARENT_SCOPE)
......@@ -422,7 +422,7 @@ elseif(WIN32)
COMMAND ${PYTHON_EXE}
ARGS "${FAUST_PYTHON_BIN_DIR}/setup.py" "build_ext" "--inplace"
COMMENT "Creating pyfaust${PY_VER}")
string(REGEX REPLACE ".*([0-9])$" "\\1" PY3_MINOR_VER ${PY_VER})
string(REGEX REPLACE "Python ([0-9])\\.([0-9]+).*$" "\\1\\2" PY3_MINOR_VER ${PY_VER_})
set(PY3_MINOR_VER ${PY3_MINOR_VER} PARENT_SCOPE)
endif()
endforeach()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment