From: rnc Date: Wed, 3 Jul 2013 09:27:15 +0000 (+0000) Subject: BUG: GUI/CMake files: Adrien Bruneton : Fixed missing path for searching of QtCore.sip X-Git-Tag: B4KillOfAutomake~9 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=176aea1099e5e2f5088bccdef3efa11df7db660c;p=modules%2Fgui.git BUG: GUI/CMake files: Adrien Bruneton : Fixed missing path for searching of QtCore.sip --- diff --git a/adm_local/cmake_files/FindPyQt4.cmake b/adm_local/cmake_files/FindPyQt4.cmake index 821ce3b34..ac8df0052 100644 --- a/adm_local/cmake_files/FindPyQt4.cmake +++ b/adm_local/cmake_files/FindPyQt4.cmake @@ -51,7 +51,8 @@ GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH) # Typical location of qobject.sip are: # - /usr/share/sip/PyQt4/QtCore, for a system install # - or /sip/QtCore, for a custom install -FIND_FILE(PYQT_SIP_MAIN_FILE qobject.sip PATH_SUFFIXES sip/QtCore share/sip/PyQt4/QtCore) +# - or /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) IF(PYQT_SIP_MAIN_FILE) GET_FILENAME_COMPONENT(PYQT_SIPS_DIR "${PYQT_SIP_MAIN_FILE}" PATH)