argilo
/
gr-osmosdr
forked from sdr/gr-osmosdr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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:
Dimitri Stolnikov 2013-03-17 10:38:20 +01:00
parent e77017f652
commit fd56ae7640
14 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -129,7 +129,7 @@ endif()
# Setup the include and linker paths # Setup the include and linker paths
######################################################################## ########################################################################
include_directories( include_directories(
${CMAKE_SOURCE_DIR}/include/osmosdr ${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/lib
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${GRUEL_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS}

8
cmake/Modules/FindGnuradioAudio.cmake
View File

@ -3,11 +3,11 @@ PKG_CHECK_MODULES(PC_GNURADIO_AUDIO gnuradio-audio)
FIND_PATH( FIND_PATH(
GNURADIO_AUDIO_INCLUDE_DIRS GNURADIO_AUDIO_INCLUDE_DIRS
NAMES gr_audio_api.h NAMES gnuradio/gr_audio_api.h
HINTS $ENV{GNURADIO_AUDIO_DIR}/include/gnuradio HINTS $ENV{GNURADIO_AUDIO_DIR}/include
${PC_GNURADIO_AUDIO_INCLUDEDIR} ${PC_GNURADIO_AUDIO_INCLUDEDIR}
PATHS /usr/local/include/gnuradio PATHS /usr/local/include
/usr/include/gnuradio /usr/include
) )
FIND_LIBRARY( FIND_LIBRARY(

2
cmake/Modules/FindGnuradioCore.cmake
View File

@ -3,7 +3,7 @@ PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core)
FIND_PATH( FIND_PATH(
GNURADIO_CORE_INCLUDE_DIRS GNURADIO_CORE_INCLUDE_DIRS
NAMES gr_random.h NAMES gr_core_api.h
HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio
${PC_GNURADIO_CORE_INCLUDEDIR} ${PC_GNURADIO_CORE_INCLUDEDIR}
${CMAKE_INSTALL_PREFIX}/include/gnuradio ${CMAKE_INSTALL_PREFIX}/include/gnuradio

2
gnuradio-osmosdr.pc.in
View File

@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@ prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix} exec_prefix=${prefix}
libdir=${exec_prefix}/@GR_LIBRARY_DIR@ libdir=${exec_prefix}/@GR_LIBRARY_DIR@
includedir=${prefix}/@GR_INCLUDE_DIR@/osmosdr includedir=${prefix}/@GR_INCLUDE_DIR@
Name: @CPACK_PACKAGE_NAME@ Name: @CPACK_PACKAGE_NAME@
Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@ Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@

4
include/osmosdr/osmosdr_device.h
View File

@ -21,8 +21,8 @@
#ifndef INCLUDED_OSMOSDR_DEVICE_H #ifndef INCLUDED_OSMOSDR_DEVICE_H
#define INCLUDED_OSMOSDR_DEVICE_H #define INCLUDED_OSMOSDR_DEVICE_H
#include <osmosdr_api.h> #include <osmosdr/osmosdr_api.h>
#include <osmosdr_pimpl.h> #include <osmosdr/osmosdr_pimpl.h>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <stdexcept> #include <stdexcept>

4
include/osmosdr/osmosdr_ranges.h
View File

@ -18,8 +18,8 @@
#ifndef INCLUDED_OSMOSDR_RANGES_H #ifndef INCLUDED_OSMOSDR_RANGES_H
#define INCLUDED_OSMOSDR_RANGES_H #define INCLUDED_OSMOSDR_RANGES_H
#include <osmosdr_api.h> #include <osmosdr/osmosdr_api.h>
#include <osmosdr_pimpl.h> #include <osmosdr/osmosdr_pimpl.h>
#include <string> #include <string>
#include <vector> #include <vector>

4
include/osmosdr/osmosdr_sink_c.h
View File

@ -20,8 +20,8 @@
#ifndef INCLUDED_OSMOSDR_SINK_C_H #ifndef INCLUDED_OSMOSDR_SINK_C_H
#define INCLUDED_OSMOSDR_SINK_C_H #define INCLUDED_OSMOSDR_SINK_C_H
#include <osmosdr_api.h> #include <osmosdr/osmosdr_api.h>
#include <gr_hier_block2.h> #include <gnuradio/gr_hier_block2.h>
class osmosdr_sink_c; class osmosdr_sink_c;

6
include/osmosdr/osmosdr_source_c.h
View File

@ -20,9 +20,9 @@
#ifndef INCLUDED_OSMOSDR_SOURCE_C_H #ifndef INCLUDED_OSMOSDR_SOURCE_C_H
#define INCLUDED_OSMOSDR_SOURCE_C_H #define INCLUDED_OSMOSDR_SOURCE_C_H
#include <osmosdr_api.h> #include <osmosdr/osmosdr_api.h>
#include <osmosdr_ranges.h> #include <osmosdr/osmosdr_ranges.h>
#include <gr_hier_block2.h> #include <gnuradio/gr_hier_block2.h>
class osmosdr_source_c; class osmosdr_source_c;

2
lib/osmosdr_device.cc
View File

@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include <osmosdr_device.h> #include <osmosdr/osmosdr_device.h>
#include <stdexcept> #include <stdexcept>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/format.hpp> #include <boost/format.hpp>

2
lib/osmosdr_ranges.cc
View File

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
// //
#include <osmosdr_ranges.h> #include <osmosdr/osmosdr_ranges.h>
#include <stdexcept> #include <stdexcept>
#include <boost/math/special_functions/round.hpp> #include <boost/math/special_functions/round.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>

2
lib/osmosdr_sink_c_impl.h
View File

@ -20,7 +20,7 @@
#ifndef INCLUDED_OSMOSDR_SINK_C_IMPL_H #ifndef INCLUDED_OSMOSDR_SINK_C_IMPL_H
#define 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 class osmosdr_sink_c_impl : public osmosdr_sink_c
{ {

2
lib/osmosdr_source_c_impl.h
View File

@ -20,7 +20,7 @@
#ifndef INCLUDED_OSMOSDR_SOURCE_C_IMPL_H #ifndef INCLUDED_OSMOSDR_SOURCE_C_IMPL_H
#define 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 #ifdef HAVE_IQBALANCE
#include <iqbalance_optimize_c.h> #include <iqbalance_optimize_c.h>

2
lib/osmosdr_src_iface.h
View File

@ -21,7 +21,7 @@
#ifndef OSMOSDR_SRC_IFACE_H #ifndef OSMOSDR_SRC_IFACE_H
#define OSMOSDR_SRC_IFACE_H #define OSMOSDR_SRC_IFACE_H
#include <osmosdr_ranges.h> #include <osmosdr/osmosdr_ranges.h>
#include <gr_basic_block.h> #include <gr_basic_block.h>
class osmosdr_src_iface; class osmosdr_src_iface;

16
swig/osmosdr_swig.i
View File

@ -11,31 +11,31 @@
%include "osmosdr_swig_doc.i" %include "osmosdr_swig_doc.i"
%{ %{
#include "osmosdr_device.h" #include "osmosdr/osmosdr_device.h"
#include "osmosdr_source_c.h" #include "osmosdr/osmosdr_source_c.h"
//#include "osmosdr_sink_c.h" //#include "osmosdr/osmosdr_sink_c.h"
%} %}
%template(string_vector_t) std::vector<std::string>; %template(string_vector_t) std::vector<std::string>;
//%template(size_vector_t) std::vector<size_t>; //%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 %ignore osmosdr::device_t::operator[]; //ignore warnings about %extend
%template(string_string_dict_t) std::map<std::string, std::string>; //define before device %template(string_string_dict_t) std::map<std::string, std::string>; //define before device
%template(devices_t) std::vector<osmosdr::device_t>; %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 %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); 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); //GR_SWIG_BLOCK_MAGIC(osmosdr,sink_c);
//%include "osmosdr_sink_c.h" //%include "osmosdr/osmosdr_sink_c.h"
#if SWIGGUILE #if SWIGGUILE
%scheme %{ %scheme %{