cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve python version detection when multiple versions are installed

Browse Source 
Add Python${MODPY_MAJOR_VERSION}_{EXECUTABLE,LIBRARY_DIRS,INCLUDE_DIR}
to help CMake to detect the correct python ports version.

OK tb@, discovered in an aarch64 bulk build with Python 3.10 installed at the
time of build.
This commit is contained in:
rsadowski 2022-10-28 17:05:18 +00:00
parent d61797c145
commit 93252f9e0b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devel/cmake/cmake.port.mk
View File

@ -63,9 +63,12 @@ MAKE_ENV += JAVA_HOME=${JAVA_HOME}
# Python
.if ${MODULES:Mlang/python}
# https://cmake.org/cmake/help/latest/module/FindPython3.html#artifacts-specification
CONFIGURE_ARGS += -DPYTHON_EXECUTABLE=${MODPY_BIN}
CONFIGURE_ARGS += -DPYTHON_LIBRARY_DIRS=${MODPY_LIBDIR}
CONFIGURE_ARGS += -DPYTHON_INCLUDE_DIR=${MODPY_INCDIR}
CONFIGURE_ARGS += -DPython_EXECUTABLE=${MODPY_BIN}
CONFIGURE_ARGS += -DPython_LIBRARY_DIRS=${MODPY_LIBDIR}
CONFIGURE_ARGS += -DPython_INCLUDE_DIR=${MODPY_INCDIR}
CONFIGURE_ARGS += -DPython${MODPY_MAJOR_VERSION}_EXECUTABLE=${MODPY_BIN}
CONFIGURE_ARGS += -DPython${MODPY_MAJOR_VERSION}_LIBRARY_DIRS=${MODPY_LIBDIR}
CONFIGURE_ARGS += -DPython${MODPY_MAJOR_VERSION}_INCLUDE_DIR=${MODPY_INCDIR}
.endif
# Lua