zeromq: initial surgery to add to master build

Author: jmcorgan

CMakeLists.txt

@@ -327,6 +327,7 @@ add_subdirectory(gr-vocoder)
 add_subdirectory(gr-fcd)
 add_subdirectory(gr-wavelet)
 add_subdirectory(gr-wxgui)
+add_subdirectory(gr-zeromq)
 
 # Defining GR_CTRLPORT for gnuradio/config.h
 if(ENABLE_GR_CTRLPORT)

gr-zeromq/cmake/Modules/FindZeroMQ.cmake cmake/Modules/FindZeroMQ.cmake

@@ -1,4 +1,4 @@
-# Copyright 2011,2012 Free Software Foundation, Inc.
+# Copyright 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -19,132 +19,94 @@
 
 
 ########################################################################
-# Project setup
+# Setup dependencies
 ########################################################################
-cmake_minimum_required(VERSION 2.6)
-project(gr-zmqblocks CXX C)
-enable_testing()
-
-#select the release build type by default to get optimization flags
-if(NOT CMAKE_BUILD_TYPE)
-   set(CMAKE_BUILD_TYPE "Release")
-   message(STATUS "Build type not specified: defaulting to release.")
-endif(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
-
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
-
-# don't use doxygen by default
-option(ENABLE_DOXYGEN "Build and install documentation" OFF)
+include(GrBoost)
+find_package(ZeroMQ)
 
 ########################################################################
-# Compiler specific setup
+# Register component
 ########################################################################
-if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
-    #http://gcc.gnu.org/wiki/Visibility
-    add_definitions(-fvisibility=hidden)
-endif()
+include(GrComponent)
 
-########################################################################
-# Find boost
-########################################################################
-if(UNIX AND EXISTS "/usr/lib64")
-    list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
-endif(UNIX AND EXISTS "/usr/lib64")
-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"
-    "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49"
-    "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54"
-    "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59"
-    "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64"
-    "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69"
+GR_REGISTER_COMPONENT("gr-zeromq" ENABLE_GR_ZEROMQ
+    Boost_FOUND
+    ENABLE_GNURADIO_RUNTIME
+    ZEROMQ_FOUND
 )
-find_package(Boost "1.35" COMPONENTS filesystem system)
 
-if(NOT Boost_FOUND)
-    message(FATAL_ERROR "Boost required to compile zmqblocks")
-endif()
+GR_SET_GLOBAL(GR_ZEROMQ_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/lib
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
 
-########################################################################
-# Install directories
-########################################################################
-include(GrPlatform) #define LIB_SUFFIX
-set(GR_RUNTIME_DIR      bin)
-set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
-set(GR_INCLUDE_DIR      include/zmqblocks)
-set(GR_DATA_DIR         share)
-set(GR_PKG_DATA_DIR     ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
-set(GR_DOC_DIR          ${GR_DATA_DIR}/doc)
-set(GR_PKG_DOC_DIR      ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME})
-set(GR_CONF_DIR         etc)
-set(GR_PKG_CONF_DIR     ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d)
-set(GR_LIBEXEC_DIR      libexec)
-set(GR_PKG_LIBEXEC_DIR  ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
-set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)
+SET(GR_PKG_ZEROMQ_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/zeromq)
 
 ########################################################################
-# Find gnuradio build dependencies
+# Begin conditional configuration
 ########################################################################
-find_package(GnuradioRuntime)
-find_package(CppUnit)
-find_package(ZeroMQ REQUIRED)
-
-# To run a more advanced search for GNU Radio and it's components and
-# versions, use the following. Add any components required to the list
-# of GR_REQUIRED_COMPONENTS (in all caps) and change "version" to the
-# minimum API compatible version required.
-#
-# set(GR_REQUIRED_COMPONENTS RUNTIME BLOCKS FILTER ...)
-# find_package(Gnuradio "version")
+if(ENABLE_GR_ZEROMQ)
 
-if(NOT GNURADIO_RUNTIME_FOUND)
-    message(FATAL_ERROR "GnuRadio Runtime required to compile zmqblocks")
-endif()
-if(NOT CPPUNIT_FOUND)
-    message(FATAL_ERROR "CppUnit required to compile zmqblocks")
-endif()
 
 ########################################################################
-# Setup the include and linker paths
+# Setup CPack components
 ########################################################################
-include_directories(
-    ${CMAKE_SOURCE_DIR}/include
-    ${Boost_INCLUDE_DIRS}
-    ${CPPUNIT_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${ZeroMQ_INCLUDE_DIRS}
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_ZEROMQ_DESCRIPTION "GNU Radio ZeromMQ Interface Blocks")
+
+CPACK_COMPONENT("zeromq_runtime"
+    GROUP        "ZeroMQ Blocks"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "runtime_runtime"
 )
 
-link_directories(
-    ${Boost_LIBRARY_DIRS}
-    ${CPPUNIT_LIBRARY_DIRS}
-    ${GNURADIO_RUNTIME_LIBRARY_DIRS}
+CPACK_COMPONENT("zeromq_devel"
+    GROUP        "ZeroMQ Blocks"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "runtime_devel"
 )
 
-# Set component parameters
-set(GR_ZMQBLOCKS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE INTERNAL "" FORCE)
-set(GR_ZMQBLOCKS_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/swig CACHE INTERNAL "" FORCE)
+CPACK_COMPONENT("zeromq_python"
+    GROUP        "ZeroMQ Blocks"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "runtime_python;zeromq_runtime"
+)
+
+CPACK_COMPONENT("zeromq_swig"
+    GROUP        "ZeroMQ Blocks"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "runtime_swig;zeromq_python;zeromq_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+#add_subdirectory(include/gnuradio/zeromq)
+#add_subdirectory(lib)
+#if(ENABLE_PYTHON)
+#    add_subdirectory(swig)
+#    add_subdirectory(python/zeromq)
+#    add_subdirectory(grc)
+#    add_subdirectory(examples)
+#endif(ENABLE_PYTHON)
+#add_subdirectory(doc)
 
 ########################################################################
-# Create uninstall target
+# Create Pkg Config File
 ########################################################################
 configure_file(
-    ${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-zeromq.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-zeromq.pc
 @ONLY)
 
-add_custom_target(uninstall
-    ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-zeromq.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "zeromq_devel"
 )
 
-########################################################################
-# Add subdirectories
-########################################################################
-add_subdirectory(include/zmqblocks)
-add_subdirectory(lib)
-add_subdirectory(swig)
-add_subdirectory(python/zmqblocks)
-add_subdirectory(grc)
-add_subdirectory(examples)
-add_subdirectory(docs)
+endif(ENABLE_GR_ZEROMQ)