forked from sdr/gr-osmosdr
adopt gnuradio component header structure
this makes it neccessary to include headers with the osmosdr/ prefix thanks to Alexandru Csete for pointing this out.
This commit is contained in:
parent
e77017f652
commit
fd56ae7640
|
@ -129,7 +129,7 @@ endif()
|
|||
# Setup the include and linker paths
|
||||
########################################################################
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/include/osmosdr
|
||||
${CMAKE_SOURCE_DIR}/include
|
||||
${CMAKE_SOURCE_DIR}/lib
|
||||
${Boost_INCLUDE_DIRS}
|
||||
${GRUEL_INCLUDE_DIRS}
|
||||
|
|
|
@ -3,11 +3,11 @@ PKG_CHECK_MODULES(PC_GNURADIO_AUDIO gnuradio-audio)
|
|||
|
||||
FIND_PATH(
|
||||
GNURADIO_AUDIO_INCLUDE_DIRS
|
||||
NAMES gr_audio_api.h
|
||||
HINTS $ENV{GNURADIO_AUDIO_DIR}/include/gnuradio
|
||||
NAMES gnuradio/gr_audio_api.h
|
||||
HINTS $ENV{GNURADIO_AUDIO_DIR}/include
|
||||
${PC_GNURADIO_AUDIO_INCLUDEDIR}
|
||||
PATHS /usr/local/include/gnuradio
|
||||
/usr/include/gnuradio
|
||||
PATHS /usr/local/include
|
||||
/usr/include
|
||||
)
|
||||
|
||||
FIND_LIBRARY(
|
||||
|
|
|
@ -3,7 +3,7 @@ PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core)
|
|||
|
||||
FIND_PATH(
|
||||
GNURADIO_CORE_INCLUDE_DIRS
|
||||
NAMES gr_random.h
|
||||
NAMES gr_core_api.h
|
||||
HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio
|
||||
${PC_GNURADIO_CORE_INCLUDEDIR}
|
||||
${CMAKE_INSTALL_PREFIX}/include/gnuradio
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
prefix=@CMAKE_INSTALL_PREFIX@
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/@GR_LIBRARY_DIR@
|
||||
includedir=${prefix}/@GR_INCLUDE_DIR@/osmosdr
|
||||
includedir=${prefix}/@GR_INCLUDE_DIR@
|
||||
|
||||
Name: @CPACK_PACKAGE_NAME@
|
||||
Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
#ifndef INCLUDED_OSMOSDR_DEVICE_H
|
||||
#define INCLUDED_OSMOSDR_DEVICE_H
|
||||
|
||||
#include <osmosdr_api.h>
|
||||
#include <osmosdr_pimpl.h>
|
||||
#include <osmosdr/osmosdr_api.h>
|
||||
#include <osmosdr/osmosdr_pimpl.h>
|
||||
#include <boost/noncopyable.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <stdexcept>
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
#ifndef INCLUDED_OSMOSDR_RANGES_H
|
||||
#define INCLUDED_OSMOSDR_RANGES_H
|
||||
|
||||
#include <osmosdr_api.h>
|
||||
#include <osmosdr_pimpl.h>
|
||||
#include <osmosdr/osmosdr_api.h>
|
||||
#include <osmosdr/osmosdr_pimpl.h>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
#ifndef INCLUDED_OSMOSDR_SINK_C_H
|
||||
#define INCLUDED_OSMOSDR_SINK_C_H
|
||||
|
||||
#include <osmosdr_api.h>
|
||||
#include <gr_hier_block2.h>
|
||||
#include <osmosdr/osmosdr_api.h>
|
||||
#include <gnuradio/gr_hier_block2.h>
|
||||
|
||||
class osmosdr_sink_c;
|
||||
|
||||
|
|
|
@ -20,9 +20,9 @@
|
|||
#ifndef INCLUDED_OSMOSDR_SOURCE_C_H
|
||||
#define INCLUDED_OSMOSDR_SOURCE_C_H
|
||||
|
||||
#include <osmosdr_api.h>
|
||||
#include <osmosdr_ranges.h>
|
||||
#include <gr_hier_block2.h>
|
||||
#include <osmosdr/osmosdr_api.h>
|
||||
#include <osmosdr/osmosdr_ranges.h>
|
||||
#include <gnuradio/gr_hier_block2.h>
|
||||
|
||||
class osmosdr_source_c;
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include <osmosdr_device.h>
|
||||
#include <osmosdr/osmosdr_device.h>
|
||||
#include <stdexcept>
|
||||
#include <boost/foreach.hpp>
|
||||
#include <boost/format.hpp>
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
#include <osmosdr_ranges.h>
|
||||
#include <osmosdr/osmosdr_ranges.h>
|
||||
#include <stdexcept>
|
||||
#include <boost/math/special_functions/round.hpp>
|
||||
#include <boost/foreach.hpp>
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#ifndef INCLUDED_OSMOSDR_SINK_C_IMPL_H
|
||||
#define INCLUDED_OSMOSDR_SINK_C_IMPL_H
|
||||
|
||||
#include <osmosdr_sink_c.h>
|
||||
#include <osmosdr/osmosdr_sink_c.h>
|
||||
|
||||
class osmosdr_sink_c_impl : public osmosdr_sink_c
|
||||
{
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#ifndef INCLUDED_OSMOSDR_SOURCE_C_IMPL_H
|
||||
#define INCLUDED_OSMOSDR_SOURCE_C_IMPL_H
|
||||
|
||||
#include <osmosdr_source_c.h>
|
||||
#include <osmosdr/osmosdr_source_c.h>
|
||||
|
||||
#ifdef HAVE_IQBALANCE
|
||||
#include <iqbalance_optimize_c.h>
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#ifndef OSMOSDR_SRC_IFACE_H
|
||||
#define OSMOSDR_SRC_IFACE_H
|
||||
|
||||
#include <osmosdr_ranges.h>
|
||||
#include <osmosdr/osmosdr_ranges.h>
|
||||
#include <gr_basic_block.h>
|
||||
|
||||
class osmosdr_src_iface;
|
||||
|
|
|
@ -11,31 +11,31 @@
|
|||
%include "osmosdr_swig_doc.i"
|
||||
|
||||
%{
|
||||
#include "osmosdr_device.h"
|
||||
#include "osmosdr_source_c.h"
|
||||
//#include "osmosdr_sink_c.h"
|
||||
#include "osmosdr/osmosdr_device.h"
|
||||
#include "osmosdr/osmosdr_source_c.h"
|
||||
//#include "osmosdr/osmosdr_sink_c.h"
|
||||
%}
|
||||
|
||||
%template(string_vector_t) std::vector<std::string>;
|
||||
|
||||
//%template(size_vector_t) std::vector<size_t>;
|
||||
|
||||
%include <osmosdr_pimpl.h>
|
||||
%include <osmosdr/osmosdr_pimpl.h>
|
||||
|
||||
%ignore osmosdr::device_t::operator[]; //ignore warnings about %extend
|
||||
|
||||
%template(string_string_dict_t) std::map<std::string, std::string>; //define before device
|
||||
%template(devices_t) std::vector<osmosdr::device_t>;
|
||||
%include <osmosdr_device.h>
|
||||
%include <osmosdr/osmosdr_device.h>
|
||||
|
||||
%template(range_vector_t) std::vector<osmosdr::range_t>; //define before range
|
||||
%include <osmosdr_ranges.h>
|
||||
%include <osmosdr/osmosdr_ranges.h>
|
||||
|
||||
GR_SWIG_BLOCK_MAGIC(osmosdr,source_c);
|
||||
%include "osmosdr_source_c.h"
|
||||
%include "osmosdr/osmosdr_source_c.h"
|
||||
|
||||
//GR_SWIG_BLOCK_MAGIC(osmosdr,sink_c);
|
||||
//%include "osmosdr_sink_c.h"
|
||||
//%include "osmosdr/osmosdr_sink_c.h"
|
||||
|
||||
#if SWIGGUILE
|
||||
%scheme %{
|
||||
|
|
Loading…
Reference in New Issue