forked from sdr/gr-osmosdr
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
This commit is contained in:
parent
e415d843c7
commit
1772222cb3
|
@ -131,7 +131,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H=1)
|
||||||
include_directories(APPEND ${CMAKE_CURRENT_BINARY_DIR})
|
include_directories(APPEND ${CMAKE_CURRENT_BINARY_DIR})
|
||||||
CONFIGURE_FILE(
|
CONFIGURE_FILE(
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
|
${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/config.h
|
${CMAKE_CURRENT_BINARY_DIR}/gr_osmosdr_config.h
|
||||||
@ONLY)
|
@ONLY)
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
|
@ -24,7 +24,8 @@
|
||||||
* file included in your .cc file.
|
* file included in your .cc file.
|
||||||
*/
|
*/
|
||||||
#ifdef HAVE_CONFIG_H
|
#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
|
#endif
|
||||||
|
|
||||||
#include <osmosdr_source_c_impl.h>
|
#include <osmosdr_source_c_impl.h>
|
||||||
|
@ -113,9 +114,9 @@ osmosdr_source_c_impl::osmosdr_source_c_impl (const std::string &args)
|
||||||
dev_types.push_back("miri");
|
dev_types.push_back("miri");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
std::cerr << "gr-osmosdr ("
|
std::cerr << "gr-osmosdr "
|
||||||
<< GR_OSMOSDR_VERSION << " / " << GR_OSMOSDR_LIBVER
|
<< "(" << GR_OSMOSDR_VERSION << " / " << GR_OSMOSDR_LIBVER << ") "
|
||||||
<< ") supported device types:" << std::endl;
|
<< "supported device types:" << std::endl;
|
||||||
std::cerr << " " << std::flush;
|
std::cerr << " " << std::flush;
|
||||||
BOOST_FOREACH(std::string dev_type, dev_types)
|
BOOST_FOREACH(std::string dev_type, dev_types)
|
||||||
std::cerr << dev_type << " ";
|
std::cerr << dev_type << " ";
|
||||||
|
|
Loading…
Reference in New Issue