Skip to content

Commit

Permalink
graphics/qgis: Use default Python version
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mrpotatogun authored and rhurlin committed Jul 14, 2023
1 parent c556b8a commit c3a4137
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions graphics/qgis/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,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 \
Expand Down

0 comments on commit c3a4137

Please sign in to comment.