sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #57218 from troopa81/fix_sip_mod_dir

Browse Source 
[Qt6][Sip] Correctly retrieve PyQt module directory
This commit is contained in:
Matthias Kuhn 2024-04-25 16:10:03 +02:00 committed by GitHub
commit 1f00b40630
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/FindPyQt5.cmake
View File

@ -34,8 +34,8 @@ ELSE(EXISTS PYQT5_VERSION_STR)
ENDIF(_pyqt5_metadata)
IF(PYQT5_VERSION_STR)
SET(PYQT5_MOD_DIR "${Python_SITEARCH}/PyQt5")
SET(PYQT5_SIP_DIR "${Python_SITEARCH}/PyQt5/bindings")
EXECUTE_PROCESS(COMMAND ${Python_EXECUTABLE} -c "import os; import PyQt5; print(os.path.dirname(PyQt5.__file__), end='')" OUTPUT_VARIABLE PYQT5_MOD_DIR)
SET(PYQT5_SIP_DIR "${PYQT5_MOD_DIR}/bindings")
FIND_PROGRAM(__pyuic5 "pyuic5")
GET_FILENAME_COMPONENT(PYQT5_BIN_DIR ${__pyuic5} DIRECTORY)

4
cmake/FindPyQt6.cmake
View File

@ -34,8 +34,8 @@ ELSE(EXISTS PYQT6_VERSION_STR)
ENDIF(_pyqt6_metadata)
IF(PYQT6_VERSION_STR)
SET(PYQT6_MOD_DIR "${Python_SITEARCH}/PyQt6")
SET(PYQT6_SIP_DIR "${Python_SITEARCH}/PyQt6/bindings")
EXECUTE_PROCESS(COMMAND ${Python_EXECUTABLE} -c "import os; import PyQt6; print(os.path.dirname(PyQt6.__file__), end='')" OUTPUT_VARIABLE PYQT6_MOD_DIR)
SET(PYQT6_SIP_DIR "${PYQT6_MOD_DIR}/bindings")
FIND_PROGRAM(__pyuic6 "pyuic6")
GET_FILENAME_COMPONENT(PYQT6_BIN_DIR ${__pyuic6} DIRECTORY)