Some Windows fixes

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011,2013 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -50,6 +50,21 @@ endif()
 if(UNIX AND EXISTS "/usr/lib64")
     list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
 endif(UNIX AND EXISTS "/usr/lib64")
+
+if(MSVC)
+	SET(BOOST_REQUIRED_COMPONENTS thread date_time)
+
+	if (NOT DEFINED BOOST_ALL_DYN_LINK)
+		set(BOOST_ALL_DYN_LINK TRUE)
+	endif()
+	set(BOOST_ALL_DYN_LINK "${BOOST_ALL_DYN_LINK}" CACHE BOOL "boost enable dynamic linking")
+	if(BOOST_ALL_DYN_LINK)
+		add_definitions(-DBOOST_ALL_DYN_LINK) #setup boost auto-linking in msvc
+	else(BOOST_ALL_DYN_LINK)
+		unset(BOOST_REQUIRED_COMPONENTS) #empty components list for static link
+	endif(BOOST_ALL_DYN_LINK)
+endif()
+
 set(Boost_ADDITIONAL_VERSIONS
     "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39"
     "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44"

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)

lib/air_modes_preamble.cc

@@ -1,5 +1,6 @@
 /*
 # Copyright 2010 Nick Foster
+# Copyright 2013 Nicholas Corgan
 # 
 # This file is part of gr-air-modes
 # 
@@ -24,6 +25,7 @@
 #include "config.h"
 #endif
 
+#include <ciso646>
 #include <air_modes_preamble.h>
 #include <gr_io_signature.h>
 #include <string.h>

lib/air_modes_slicer.cc

@@ -1,5 +1,6 @@
 /*
 # Copyright 2010 Nick Foster
+# Copyright 2013 Nicholas Corgan
 # 
 # This file is part of gr-air-modes
 # 
@@ -24,6 +25,7 @@
 #include "config.h"
 #endif
 
+#include <ciso646>
 #include <air_modes_slicer.h>
 #include <gr_io_signature.h>
 #include <air_modes_types.h>

res/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011,2013 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -31,14 +31,17 @@ if(NOT PYQT4_FOUND)
     return()
 endif()
 
+if(NOT PYUIC4_FOUND)
+    message(STATUS "pyuic4 not found, not installing GUI application")
+    return()
+endif()
+
 find_package(Qwt)
 if(NOT QWT_FOUND)
     message(STATUS "Qwt not found, not installing GUI application")
     return()
 endif()
 
-
-set(PYUIC4_COMPILE pyuic4)
 set(RX_UI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/modes_rx.ui)
 set(RX_UI_PY_PRE_MASSAGE ${CMAKE_CURRENT_BINARY_DIR}/modes_rx_ui_borked.py)
 set(RX_UI_PY ${CMAKE_CURRENT_BINARY_DIR}/modes_rx_ui.py)
@@ -49,7 +52,7 @@ add_custom_target(rx_ui ALL
 )
 
 add_custom_command(OUTPUT ${RX_UI_PY_PRE_MASSAGE}
-    COMMAND ${PYUIC4_COMPILE} ${RX_UI_SRC} > ${RX_UI_PY_PRE_MASSAGE}
+    COMMAND ${PYUIC4_EXECUTABLE} ${RX_UI_SRC} > ${RX_UI_PY_PRE_MASSAGE}
     MAIN_DEPENDENCY ${RX_UI_SRC}
 )