From 1772222cb3c82ad2cab608911a159776bc2c2979 Mon Sep 17 00:00:00 2001 From: Dimitri Stolnikov Date: Mon, 11 Mar 2013 21:13:38 +0100 Subject: [PATCH] workaround for build system related bug caused by gnuradio master They really should not name the header config.h: http://gnuradio.org/cgit/gnuradio.git/commit/?id=9297c84dfdae3002677f759ef2b38a877d2edc2c --- lib/CMakeLists.txt | 2 +- lib/osmosdr_source_c_impl.cc | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 4f9d7d3..1a3afd0 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -131,7 +131,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H=1) include_directories(APPEND ${CMAKE_CURRENT_BINARY_DIR}) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/config.h + ${CMAKE_CURRENT_BINARY_DIR}/gr_osmosdr_config.h @ONLY) ######################################################################## diff --git a/lib/osmosdr_source_c_impl.cc b/lib/osmosdr_source_c_impl.cc index 708831c..ed23576 100644 --- a/lib/osmosdr_source_c_impl.cc +++ b/lib/osmosdr_source_c_impl.cc @@ -24,7 +24,8 @@ * file included in your .cc file. */ #ifdef HAVE_CONFIG_H -#include "config.h" +// FIXME: make it config.h again when they've fixed gnuradio master +#include "gr_osmosdr_config.h" #endif #include @@ -113,9 +114,9 @@ osmosdr_source_c_impl::osmosdr_source_c_impl (const std::string &args) dev_types.push_back("miri"); #endif - std::cerr << "gr-osmosdr (" - << GR_OSMOSDR_VERSION << " / " << GR_OSMOSDR_LIBVER - << ") supported device types:" << std::endl; + std::cerr << "gr-osmosdr " + << "(" << GR_OSMOSDR_VERSION << " / " << GR_OSMOSDR_LIBVER << ") " + << "supported device types:" << std::endl; std::cerr << " " << std::flush; BOOST_FOREACH(std::string dev_type, dev_types) std::cerr << dev_type << " ";