diff options
| author | Simon Edwards <simon@simonzone.com> | 2008-12-17 20:33:13 +0000 |
|---|---|---|
| committer | Simon Edwards <simon@simonzone.com> | 2008-12-17 20:33:13 +0000 |
| commit | 6a41335841372f6434795b9ada5fa41652d4d845 (patch) | |
| tree | abe7e1ec57fa0949fffb2788ed57db930bb11811 | |
| parent | 67e3e2a04e3c29f72feae38afc5b5a1c54760968 (diff) | |
| download | extra-cmake-modules-6a41335841372f6434795b9ada5fa41652d4d845.tar.gz extra-cmake-modules-6a41335841372f6434795b9ada5fa41652d4d845.tar.bz2 | |
PyQt SIP flags patch applied.
CCBUGS: 177965
svn path=/trunk/KDE/kdelibs/; revision=898246
| -rw-r--r-- | modules/FindPyQt.py | 1 | ||||
| -rw-r--r-- | modules/FindPyQt4.cmake | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/modules/FindPyQt.py b/modules/FindPyQt.py index 1978f2d8..8e255319 100644 --- a/modules/FindPyQt.py +++ b/modules/FindPyQt.py @@ -20,3 +20,4 @@ for item in pyqtcfg.pyqt_sip_flags.split(' '): print("pyqt_version_tag:%s" % pyqt_version_tag) print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir) +print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags) diff --git a/modules/FindPyQt4.cmake b/modules/FindPyQt4.cmake index 68a82cbc..37f645ea 100644 --- a/modules/FindPyQt4.cmake +++ b/modules/FindPyQt4.cmake @@ -19,6 +19,8 @@ # PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files. # # PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. +# +# PYQT4_SIP_FLAGS - The SIP flags used to build PyQt. IF(EXISTS PYQT4_VERSION) # Already in cache, be silent @@ -33,6 +35,8 @@ ELSE(EXISTS PYQT4_VERSION) STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT4_VERSION_STR ${pyqt_config}) STRING(REGEX REPLACE ".*\npyqt_version_tag:([^\n]+).*$" "\\1" PYQT4_VERSION_TAG ${pyqt_config}) STRING(REGEX REPLACE ".*\npyqt_sip_dir:([^\n]+).*$" "\\1" PYQT4_SIP_DIR ${pyqt_config}) + STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1" PYQT4_SIP_FLAGS ${pyqt_config}) + SET(PYQT4_FOUND TRUE) ENDIF(pyqt_config) |