tjh.dev
1diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake
2index b51fd0075e..87ee317e05 100644
3--- a/cmake/FindPyQt5.cmake
4+++ b/cmake/FindPyQt5.cmake
5@@ -25,7 +25,7 @@ ELSE(EXISTS PYQT5_VERSION_STR)
6 IF(SIP_BUILD_EXECUTABLE)
7 # SIP >= 5.0 path
8
9- FILE(GLOB _pyqt5_metadata "${Python_SITEARCH}/PyQt5-*.dist-info/METADATA")
10+ FILE(GLOB _pyqt5_metadata "@pyQt5PackageDir@/PyQt5-*.dist-info/METADATA")
11 IF(_pyqt5_metadata)
12 FILE(READ ${_pyqt5_metadata} _pyqt5_metadata_contents)
13 STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${_pyqt5_metadata_contents})
14
15diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake
16index 69e41c1fe9..5456c3d59b 100644
17--- a/cmake/FindQsci.cmake
18+++ b/cmake/FindQsci.cmake
19@@ -24,7 +24,7 @@ ELSE(QSCI_MOD_VERSION_STR)
20 IF(SIP_BUILD_EXECUTABLE)
21 # SIP >= 5.0 path
22
23- FILE(GLOB _qsci_metadata "${Python_SITEARCH}/QScintilla*.dist-info/METADATA")
24+ FILE(GLOB _qsci_metadata "@qsciPackageDir@/QScintilla*.dist-info/METADATA")
25 IF(_qsci_metadata)
26 FILE(READ ${_qsci_metadata} _qsci_metadata_contents)
27 STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" QSCI_MOD_VERSION_STR ${_qsci_metadata_contents})
28@@ -33,7 +33,7 @@ ELSE(QSCI_MOD_VERSION_STR)
29 ENDIF(_qsci_metadata)
30
31 IF(QSCI_MOD_VERSION_STR)
32- SET(QSCI_SIP_DIR "${PYQT_SIP_DIR}")
33+ SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt5/bindings")
34 SET(QSCI_FOUND TRUE)
35 ENDIF(QSCI_MOD_VERSION_STR)
36
37diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
38index 4cd19c3af4..668cc6a5e6 100644
39--- a/python/CMakeLists.txt
40+++ b/python/CMakeLists.txt
41@@ -212,7 +212,7 @@ if (WITH_GUI)
42 install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR})
43 endif()
44 if(QSCI_SIP_DIR)
45- set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR})
46+ set(SIP_BUILD_EXTRA_OPTIONS ${SIP_BUILD_EXTRA_OPTIONS} --include-dir=${QSCI_SIP_DIR})
47 else()
48 message(STATUS "Qsci sip file not found - disabling bindings for derived classes")
49 set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_QSCI_SIP)