From 585ecf1ba661e7af7bcc901e9a0f64db5291b5b6 Mon Sep 17 00:00:00 2001
From: Nick Foster <nick@ettus.com>
Date: Sat, 26 Oct 2013 21:53:49 -0700
Subject: [PATCH] Remove FindZeroMQ as it's causing more trouble than it's
 worth. Zero_Chaos, this is my hat I'm eating.

---
 CMakeLists.txt                 |  8 -----
 cmake/Modules/FindZeroMQ.cmake | 63 ----------------------------------
 python/radio.py                |  2 +-
 3 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 cmake/Modules/FindZeroMQ.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5384817..0210f12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,14 +75,6 @@ if(NOT GNURADIO_RUNTIME_FOUND)
     message(FATAL_ERROR "GnuRadio Runtime required to compile gr-air-modes")
 endif()
 
-########################################################################
-# Find ZMQ and get version
-########################################################################
-include(FindZeroMQ)
-if(NOT ZEROMQ_FOUND)
-    message(FATAL_ERROR "ZMQ not found.")
-endif()
-
 ########################################################################
 # Find PyZMQ bindings
 ########################################################################
diff --git a/cmake/Modules/FindZeroMQ.cmake b/cmake/Modules/FindZeroMQ.cmake
deleted file mode 100644
index a988eb1..0000000
--- a/cmake/Modules/FindZeroMQ.cmake
+++ /dev/null
@@ -1,63 +0,0 @@
-# - Find zeromq libraries
-# This module finds zeromq if it is installed and determines where the
-# include files and libraries are. It also determines what the name of
-# the library is. This code sets the following variables:
-#
-#  ZEROMQ_FOUND               - have the zeromq libs been found
-#  ZEROMQ_LIBRARIES           - path to the zeromq library
-#  ZEROMQ_INCLUDE_DIRS        - path to where zmq.h is found
-#  ZEROMQ_DEBUG_LIBRARIES     - path to the debug library
-
-#INCLUDE(CMakeFindFrameworks)
-# Search for the zeromq framework on Apple.
-#CMAKE_FIND_FRAMEWORKS(ZeroMQ)
-
-find_package(PkgConfig)
-pkg_check_modules(PC_LIBZMQ libzmq)
-
-
-IF(WIN32)
-	FIND_LIBRARY(ZEROMQ_DEBUG_LIBRARY
-		NAMES libzmq_d zmq_d
-		PATHS
-			${ZEROMQ_LIBRARIES}
-	)
-ENDIF(WIN32)
-
-FIND_LIBRARY(ZEROMQ_LIBRARY
-	NAMES libzmq zmq
-    HINTS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS}
-	PATHS
-		${ZEROMQ_LIBRARIES}
-		${NSCP_LIBRARYDIR}
-)
-
-#  IF(ZeroMQ_FRAMEWORKS AND NOT ZEROMQ_INCLUDE_DIR)
-#    FOREACH(dir ${ZeroMQ_FRAMEWORKS})
-#      SET(ZEROMQ_FRAMEWORK_INCLUDES ${ZEROMQ_FRAMEWORK_INCLUDES}
-#        ${dir}/Versions/${_CURRENT_VERSION}/include/zeromq${_CURRENT_VERSION})
-#    ENDFOREACH(dir)
-#  ENDIF(ZeroMQ_FRAMEWORKS AND NOT ZEROMQ_INCLUDE_DIR)
-
-FIND_PATH(ZEROMQ_INCLUDE_DIR
-	NAMES zmq.h
-	PATHS
-#		${ZEROMQ_FRAMEWORK_INCLUDES}
-		${ZEROMQ_INCLUDE_DIRS}
-		${NSCP_INCLUDEDIR}
-		${ZEROMQ_INCLUDE_DIR}
-        ${PC_LIBZMQ_INCLUDEDIR}
-        ${PC_LIBZMQ_INCLUDE_DIRS}
-)
-
-MARK_AS_ADVANCED(
-  ZEROMQ_DEBUG_LIBRARY
-  ZEROMQ_LIBRARY
-  ZEROMQ_INCLUDE_DIR
-)
-SET(ZEROMQ_INCLUDE_DIRS "${ZEROMQ_INCLUDE_DIR}")
-SET(ZEROMQ_LIBRARIES "${ZEROMQ_LIBRARY}")
-SET(ZEROMQ_DEBUG_LIBRARIES "${ZEROMQ_DEBUG_LIBRARY}")
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZeroMQ DEFAULT_MSG ZEROMQ_LIBRARIES ZEROMQ_INCLUDE_DIRS)
diff --git a/python/radio.py b/python/radio.py
index 9d28b9f..0842d10 100644
--- a/python/radio.py
+++ b/python/radio.py
@@ -81,7 +81,7 @@ class modes_radio (gr.top_block, pubsub):
   @staticmethod
   def add_radio_options(parser):
     group = OptionGroup(parser, "Receiver setup options")
-      
+
     #Choose source
     group.add_option("-s","--source", type="string", default="uhd",
                       help="Choose source: uhd, osmocom, <filename>, or <ip:port> [default=%default]")