[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Simon Edwards <simon () simonzone ! com>
Date:       2008-12-17 20:33:13
Message-ID: 1229545993.979636.20561.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 898246 by sedwards:

PyQt SIP flags patch applied.

CCBUGS: 177965



 M  +1 -0      FindPyQt.py  
 M  +4 -0      FindPyQt4.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindPyQt.py #898245:898246
@@ -20,3 +20,4 @@
 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)
--- trunk/KDE/kdelibs/cmake/modules/FindPyQt4.cmake #898245:898246
@@ -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 @@
     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)
 
[prev in list] [next in list] [prev in thread] [next in thread]