From fa25acc782c6d99e2da186f80f4021750c0ab133 Mon Sep 17 00:00:00 2001 From: Julien Cabieces Date: Mon, 22 Apr 2024 15:24:56 +0200 Subject: [PATCH 1/2] [Qt6][Sip] Correctly retrieve PyQt module directory --- cmake/FindPyQt6.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/FindPyQt6.cmake b/cmake/FindPyQt6.cmake index d6214996387..a938417a03f 100644 --- a/cmake/FindPyQt6.cmake +++ b/cmake/FindPyQt6.cmake @@ -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) From 32cd01431be568aa1be06cedcdabb0245ece81db Mon Sep 17 00:00:00 2001 From: Julien Cabieces Date: Wed, 24 Apr 2024 08:53:31 +0200 Subject: [PATCH 2/2] Correctly retrieve PyQt5 module directory --- cmake/FindPyQt5.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake index b51fd0075ec..9fe16c5a0f3 100644 --- a/cmake/FindPyQt5.cmake +++ b/cmake/FindPyQt5.cmake @@ -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)