CVS commit: pkgsrc/lang/python

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Apr 23 19:20:08 UTC 2021

Modified Files:
        pkgsrc/lang/python: pyversion.mk

Log Message:
pyversion.mk: handle more cmake module goop


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 pkgsrc/lang/python/pyversion.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python/pyversion.mk
diff -u pkgsrc/lang/python/pyversion.mk:1.134 pkgsrc/lang/python/pyversion.mk:1.135
--- pkgsrc/lang/python/pyversion.mk:1.134       Sat Dec 19 13:12:00 2020
+++ pkgsrc/lang/python/pyversion.mk     Fri Apr 23 19:20:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.134 2020/12/19 13:12:00 nia Exp $
+# $NetBSD: pyversion.mk,v 1.135 2021/04/23 19:20:08 nia Exp $
 
 # This file determines which Python version is used as a dependency for
 # a package.
@@ -206,6 +206,19 @@ PRINT_PLIST_AWK+=  /^${PYLIB:S|/|\\/|g}/ 
 
 ALL_ENV+=              PYTHON=${PYTHONBIN}
 .if defined(USE_CMAKE)
+# used by FindPython
+CMAKE_ARGS+=           -DPython_EXECUTABLE:FILEPATH=${PYTHONBIN}
+CMAKE_ARGS+=           -DPython_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+# used by FindPython2
+.  if !empty(_PYTHON_VERSION:M2*)
+CMAKE_ARGS+=           -DPython2_EXECUTABLE:FILEPATH=${PYTHONBIN}
+CMAKE_ARGS+=           -DPython2_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+.  endif
+# used by FindPython3
+.  if !empty(_PYTHON_VERSION:M3*)
+CMAKE_ARGS+=           -DPython3_EXECUTABLE:FILEPATH=${PYTHONBIN}
+CMAKE_ARGS+=           -DPython3_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+.  endif
 # used by FindPythonInterp.cmake and FindPythonLibs.cmake
 CMAKE_ARGS+=           -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX}
 # set this explicitly, as by default it will prefer the built in framework