summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-05-02 12:02:13 -0400
committerTom Rondeau <trondeau@vt.edu>2013-05-02 12:02:13 -0400
commitba86c365110abf908afef464ad2f49743993eb2b (patch)
treebf8f338dafdafc0bd2031ebfcd83801a7d3484e0
parentf9e5b6717d557de66799c2b8b7ca96cd62661e2f (diff)
build: fixes to support out-of-tree builds.
-rw-r--r--gnuradio-runtime/gnuradio-runtime.pc.in2
-rw-r--r--gnuradio-runtime/include/gnuradio/math.h1
-rw-r--r--gnuradio-runtime/swig/CMakeLists.txt27
-rw-r--r--gnuradio-runtime/swig/runtime_swig.i50
-rw-r--r--gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt2
5 files changed, 45 insertions, 37 deletions
diff --git a/gnuradio-runtime/gnuradio-runtime.pc.in b/gnuradio-runtime/gnuradio-runtime.pc.in
index 29c7c3ce84..d4488896cb 100644
--- a/gnuradio-runtime/gnuradio-runtime.pc.in
+++ b/gnuradio-runtime/gnuradio-runtime.pc.in
@@ -8,4 +8,4 @@ Description: GNU Radio core runtime infrastructure
Requires:
Version: @LIBVER@
Libs: -L${libdir} -lgnuradio-runtime -lgnuradio-pmt
-Cflags: -I${includedir} -I${includedir}/gnuradio
+Cflags: -I${includedir}
diff --git a/gnuradio-runtime/include/gnuradio/math.h b/gnuradio-runtime/include/gnuradio/math.h
index ec4cfb014f..d611c98c95 100644
--- a/gnuradio-runtime/include/gnuradio/math.h
+++ b/gnuradio-runtime/include/gnuradio/math.h
@@ -27,6 +27,7 @@
#ifndef _GR_MATH_H_
#define _GR_MATH_H_
+#include <cmath>
#include <gnuradio/api.h>
#include <gnuradio/gr_complex.h>
diff --git a/gnuradio-runtime/swig/CMakeLists.txt b/gnuradio-runtime/swig/CMakeLists.txt
index b2fcb180b2..64350c0f21 100644
--- a/gnuradio-runtime/swig/CMakeLists.txt
+++ b/gnuradio-runtime/swig/CMakeLists.txt
@@ -91,33 +91,40 @@ install(
FILES
gnuradio_swig_bug_workaround.h
runtime_swig.i
- complex_vec_test.i
gnuradio.i
basic_block.i
+ block.i
+ block_detail.i
+ block_gateway.i
+ buffer.i
+ complex_vec_test.i
constants.i
- gr_ctrlport.i
dispatcher.i
error_handler.i
feval.i
+ gnuradio.i
+ gr_ctrlport.i
+ gr_extras.i
+ gr_intrusive_ptr.i
+ gr_logger.i
+ gr_shared_ptr.i
+ gr_swig_block_magic.i
+ gr_types.i
hier_block2.i
io_signature.i
message.i
msg_handler.i
msg_queue.i
+ pmt_swig.i
prefs.i
realtime.i
single_threaded_scheduler.i
+ sync_block.i
+ sync_decimator.i
+ sync_interpolator.i
tagged_stream_block.i
tags.i
top_block.i
- block_gateway.i
- gr_logger.i
- gr_shared_ptr.i
- gr_swig_block_magic.i
- gr_types.i
- gr_extras.i
- gr_intrusive_ptr.i
- pmt_swig.i
${CMAKE_CURRENT_BINARY_DIR}/runtime_swig_doc.i
${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
diff --git a/gnuradio-runtime/swig/runtime_swig.i b/gnuradio-runtime/swig/runtime_swig.i
index 163d4748ec..368fb4249a 100644
--- a/gnuradio-runtime/swig/runtime_swig.i
+++ b/gnuradio-runtime/swig/runtime_swig.i
@@ -71,29 +71,29 @@
%constant int sizeof_gr_complex = sizeof(gr_complex);
%include <gnuradio/endianness.h>
-%include <basic_block.i>
-%include <block.i>
-%include <block_detail.i>
-%include <buffer.i>
-%include <constants.i>
-%include <dispatcher.i>
-%include <feval.i>
-%include <error_handler.i>
-%include <hier_block2.i>
-%include <io_signature.i>
-%include <message.i>
-%include <msg_handler.i>
-%include <msg_queue.i>
-%include <prefs.i>
-%include <realtime.i>
-%include <single_threaded_scheduler.i>
-%include <sync_block.i>
-%include <sync_decimator.i>
-%include <sync_interpolator.i>
-%include <tagged_stream_block.i>
-%include <tags.i>
-%include <top_block.i>
-%include <block_gateway.i>
+%include "basic_block.i"
+%include "block.i"
+%include "block_detail.i"
+%include "buffer.i"
+%include "constants.i"
+%include "dispatcher.i"
+%include "feval.i"
+%include "error_handler.i"
+%include "hier_block2.i"
+%include "io_signature.i"
+%include "message.i"
+%include "msg_handler.i"
+%include "msg_queue.i"
+%include "prefs.i"
+%include "realtime.i"
+%include "single_threaded_scheduler.i"
+%include "sync_block.i"
+%include "sync_decimator.i"
+%include "sync_interpolator.i"
+%include "tagged_stream_block.i"
+%include "tags.i"
+%include "top_block.i"
+%include "block_gateway.i"
-%include <gr_swig_block_magic.i>
-%include <gr_ctrlport.i>
+%include "gr_swig_block_magic.i"
+%include "gr_ctrlport.i"
diff --git a/gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt
index bfcf3d521f..b9925ea06f 100644
--- a/gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt
+++ b/gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt
@@ -32,7 +32,7 @@ include(GrPython)
# Setup swig generation
########################################################################
foreach(incdir ${GNURADIO_RUNTIME_INCLUDE_DIRS})
- list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/swig)
+ list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/gnuradio/swig)
endforeach(incdir)
set(GR_SWIG_LIBRARIES gnuradio-howto)