Fix sobject.sip file not detected with custom PyQt installation

diff --git a/cmake/FindPyQt4.cmake b/cmake/FindPyQt4.cmake
index bc7affeda383cffa4eb8aac0e26824bd8f9e0313..3b9a84e263e94887945e7725fed5dd67c4606d00 100644 (file)
--- a/cmake/FindPyQt4.cmake
+++ b/cmake/FindPyQt4.cmake
@@ -56,7 +56,9 @@ GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH)
 #   - /usr/share/sip/PyQt4/QtCore, for a system install
 #   - or <xyz>/sip/QtCore, for a custom install
 #   - or <xyz>/share/sip/QtCore, for a custom install
-FIND_FILE(PYQT_SIP_MAIN_FILE qobject.sip PATH_SUFFIXES share/sip/QtCore sip/QtCore share/sip/PyQt4/QtCore)
+FIND_FILE(PYQT_SIP_MAIN_FILE qobject.sip
+  PATHS ${_tmp_ROOT_DIR}
+  PATH_SUFFIXES share/sip/QtCore sip/QtCore share/sip/PyQt4/QtCore)
 
 IF(PYQT_SIP_MAIN_FILE)
   GET_FILENAME_COMPONENT(PYQT_SIPS_DIR "${PYQT_SIP_MAIN_FILE}" PATH)

diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake
index 35efa028bd6668d5a636db276529889f2ca4e4fa..bcb4e2a1d0eb10f7cf51f9e33a3579403297bfda 100644 (file)
--- a/cmake/FindPyQt5.cmake
+++ b/cmake/FindPyQt5.cmake
@@ -56,7 +56,9 @@ GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH)
 #   - /usr/share/sip/PyQt5/QtCore, for a system install
 #   - or <xyz>/sip/QtCore, for a custom install
 #   - or <xyz>/share/sip/QtCore, for a custom install
-FIND_FILE(PYQT_SIP_MAIN_FILE qobject.sip PATH_SUFFIXES share/sip/QtCore sip/QtCore share/sip/PyQt5/QtCore)
+FIND_FILE(PYQT_SIP_MAIN_FILE qobject.sip
+  PATHS ${_tmp_ROOT_DIR}
+  PATH_SUFFIXES share/sip/QtCore sip/QtCore share/sip/PyQt5/QtCore)
 
 IF(PYQT_SIP_MAIN_FILE)
   GET_FILENAME_COMPONENT(PYQT_SIPS_DIR "${PYQT_SIP_MAIN_FILE}" PATH)