From 03c70a763abcb8487632533e8c4c81d0fe9c1ced Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Mon, 20 Oct 2008 07:20:35 +0000
Subject: Move py file here too

svn path=/trunk/KDE/kdelibs/; revision=873788
---
 modules/FindPyQt4.cmake | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 modules/FindPyQt4.cmake

(limited to 'modules/FindPyQt4.cmake')

diff --git a/modules/FindPyQt4.cmake b/modules/FindPyQt4.cmake
new file mode 100644
index 00000000..68a82cbc
--- /dev/null
+++ b/modules/FindPyQt4.cmake
@@ -0,0 +1,49 @@
+# Find PyQt4
+# ~~~~~~~~~~
+# Copyright (c) 2007-2008, Simon Edwards <simon@simonzone.com>
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+# PyQt4 website: http://www.riverbankcomputing.co.uk/pyqt/index.php
+#
+# Find the installed version of PyQt4. FindPyQt4 should only be called after
+# Python has been found.
+#
+# This file defines the following variables:
+#
+# PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number
+#     suitable for comparision as a string
+#
+# PYQT4_VERSION_STR - The version of PyQt4 as a human readable string.
+#
+# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files.
+#
+# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files.
+
+IF(EXISTS PYQT4_VERSION)
+  # Already in cache, be silent
+  SET(PYQT4_FOUND TRUE)
+ELSE(EXISTS PYQT4_VERSION)
+
+  FIND_FILE(_find_pyqt_py FindPyQt.py PATHS ${CMAKE_MODULE_PATH})
+
+  EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config)
+  IF(pyqt_config)
+    STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION ${pyqt_config})
+    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})
+    SET(PYQT4_FOUND TRUE)
+  ENDIF(pyqt_config)
+
+  IF(PYQT4_FOUND)
+    IF(NOT PYQT4_FIND_QUIETLY)
+      MESSAGE(STATUS "Found PyQt4 version: ${PYQT4_VERSION_STR}")
+    ENDIF(NOT PYQT4_FIND_QUIETLY)
+  ELSE(PYQT4_FOUND)
+    IF(PYQT4_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find Python")
+    ENDIF(PYQT4_FIND_REQUIRED)
+  ENDIF(PYQT4_FOUND)
+
+ENDIF(EXISTS PYQT4_VERSION)
-- 
cgit v1.2.1


From 6a41335841372f6434795b9ada5fa41652d4d845 Mon Sep 17 00:00:00 2001
From: Simon Edwards <simon@simonzone.com>
Date: Wed, 17 Dec 2008 20:33:13 +0000
Subject: PyQt SIP flags patch applied.

CCBUGS: 177965


svn path=/trunk/KDE/kdelibs/; revision=898246
---
 modules/FindPyQt4.cmake | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'modules/FindPyQt4.cmake')

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)
 
-- 
cgit v1.2.1