Date: Fri, 14 Jul 2023 07:25:56 GMT From: Rainer Hurling <rhurlin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 347cd7d33612 - main - graphics/qgis-ltr: Use default Python version Message-ID: <202307140725.36E7PuWP099779@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=347cd7d336121850e3b6234d4d4ebea96ab42588 commit 347cd7d336121850e3b6234d4d4ebea96ab42588 Author: alt2600@icloud.com <alt2600@icloud.com> AuthorDate: 2023-07-14 07:22:33 +0000 Commit: Rainer Hurling <rhurlin@FreeBSD.org> CommitDate: 2023-07-14 07:24:52 +0000 graphics/qgis-ltr: Use default Python version cmake's FindPython.cmake always returns the highest found Python version, although the default version is needed here, since only for this usually further tools like SIP etc. are installed. Passing the path of the default version to Python_EXECUTABLE causes the cmake configuration to use it. Co-authored-by: Rainer Hurling <rhurlin@gwdg.de> PR: 272457 MFH: 2023Q3 --- graphics/qgis-ltr/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index f16b4eed3641..342c9dd4cd77 100644 --- a/graphics/qgis-ltr/Makefile +++ b/graphics/qgis-ltr/Makefile @@ -117,11 +117,13 @@ USE_QT= 3d buildtools:build core concurrent dbus declarative \ SHEBANG_FILES= src/plugins/grass/scripts/*.py +# Python_EXECUTABLE: Use the default version if multiple Pythons are available CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \ -DHAVE_PGCONFIG=1 \ -DWITH_INTERNAL_MDAL:BOOL=false \ -DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \ -DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \ + -DPython_EXECUTABLE=${PYTHON_CMD} \ -DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \ -DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \ -DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307140725.36E7PuWP099779>