git: 1ebb3088a667 - 2023Q3 - graphics/qgis: Use default Python version
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 14 Jul 2023 07:08:26 UTC
The branch 2023Q3 has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ebb3088a667ec8f99012eaeec79a020dfeb2310 commit 1ebb3088a667ec8f99012eaeec79a020dfeb2310 Author: alt2600@icloud.com <alt2600@icloud.com> AuthorDate: 2023-07-14 06:51:53 +0000 Commit: Rainer Hurling <rhurlin@FreeBSD.org> CommitDate: 2023-07-14 07:07:40 +0000 graphics/qgis: 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> MFH: 2023Q3 (cherry picked from commit c3a413762d4f057b69e689df9ceeaf17a64419ec) --- graphics/qgis/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index cc50667175e1..a6e1a15fda6c 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -116,10 +116,12 @@ 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 \ -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 \