Some Windows fixes

cmake/Modules/FindPyQt4.cmake

@@ -1,6 +1,7 @@
 # Find PyQt4
 # ~~~~~~~~~~
 # Copyright (c) 2007-2008, Simon Edwards <simon@simonzone.com>
+# Copyright (c) 2012, Nicholas Corgan <nick.corgan@ettus.com>
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
@@ -22,10 +23,11 @@
 #
 # PYQT4_SIP_FLAGS - The SIP flags used to build PyQt.
 
-IF(EXISTS PYQT4_VERSION)
+IF(EXISTS PYQT4_VERSION AND EXISTS PYUIC4_EXECUTABLE)
   # Already in cache, be silent
   SET(PYQT4_FOUND TRUE)
-ELSE(EXISTS PYQT4_VERSION)
+  SET(PYUIC4_FOUND TRUE)
+ELSE(EXISTS PYQT4_VERSION AND EXISTS PYUIC4_EXECUTABLE)
 
   FIND_FILE(_find_pyqt_py FindPyQt.py PATHS ${CMAKE_MODULE_PATH})
 
@@ -40,14 +42,20 @@ ELSE(EXISTS PYQT4_VERSION)
     SET(PYQT4_FOUND TRUE)
   ENDIF(pyqt_config)
 
-  IF(PYQT4_FOUND)
+  FIND_PROGRAM(PYUIC4_EXECUTABLE NAMES pyuic4)
+  IF(PYUIC4_EXECUTABLE)
+    SET(PYUIC4_FOUND TRUE)
+  ENDIF(PYUIC4_EXECUTABLE)
+
+  IF(PYQT4_FOUND AND PYUIC4_FOUND)
     IF(NOT PYQT4_FIND_QUIETLY)
       MESSAGE(STATUS "Found PyQt4 version: ${PYQT4_VERSION_STR}")
+      MESSAGE(STATUS "Found pyuic4: ${PYUIC4_EXECUTABLE}")
     ENDIF(NOT PYQT4_FIND_QUIETLY)
-  ELSE(PYQT4_FOUND)
+  ELSE(PYQT4_FOUND AND PYUIC4_FOUND)
     IF(PYQT4_FIND_REQUIRED)
       MESSAGE(FATAL_ERROR "Could not find Python")
     ENDIF(PYQT4_FIND_REQUIRED)
-  ENDIF(PYQT4_FOUND)
+  ENDIF(PYQT4_FOUND AND PYUIC4_FOUND)
 
-ENDIF(EXISTS PYQT4_VERSION)
+ENDIF(EXISTS PYQT4_VERSION AND EXISTS PYUIC4_EXECUTABLE)