Skip to content

Commit 5672d2a

Browse files
trondeaujmcorgan
authored andcommitted
docs: updated CMakeLists files to point to include dirs for docstrings.
1 parent 592d4d1 commit 5672d2a

File tree

18 files changed

+20
-18
lines changed

18 files changed

+20
-18
lines changed

gr-analog/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(GR_SWIG_INCLUDE_DIRS
3232
)
3333

3434
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/analog_swig_doc.i)
35-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
35+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/analog)
3636
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
3737
set(GR_SWIG_TARGET_DEPS analog_generated_includes)
3838
set(GR_SWIG_LIBRARIES gnuradio-analog gnuradio-filter)

gr-atsc/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ set(GR_SWIG_INCLUDE_DIRS
3434
)
3535

3636
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/atsc_swig_doc.i)
37-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
37+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/atsc)
3838
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
3939
set(GR_SWIG_LIBRARIES gnuradio-atsc gnuradio-fft)
4040

gr-audio/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set(GR_SWIG_INCLUDE_DIRS
3030
)
3131

3232
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/audio_swig_doc.i)
33-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include)
33+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/audio)
3434
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
3535

3636
set(GR_SWIG_LIBRARIES gnuradio-audio)

gr-blocks/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ if(ENABLE_GR_CTRLPORT)
3636
endif(ENABLE_GR_CTRLPORT)
3737

3838
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/blocks_swig_doc.i)
39-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
39+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/blocks)
4040
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
4141
set(GR_SWIG_TARGET_DEPS blocks_generated_includes)
4242
set(GR_SWIG_LIBRARIES gnuradio-blocks)

gr-comedi/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(GR_SWIG_INCLUDE_DIRS
3232
# Setup swig docs to depend on includes and pull in from build directory
3333
set(GR_SWIG_TARGET_DEPS comedi_generated_includes)
3434
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i)
35-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
35+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/comedi)
3636
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
3737

3838
set(GR_SWIG_LIBRARIES gnuradio-comedi)

gr-digital/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ endif(ENABLE_GR_CTRLPORT)
4141
# Setup swig docs to depend on includes and pull in from build directory
4242
set(GR_SWIG_TARGET_DEPS digital_generated_includes)
4343
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/digital_swig_doc.i)
44-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
44+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/digital)
4545
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
4646

4747
set(GR_SWIG_LIBRARIES gnuradio-digital

gr-fcd/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ set(GR_SWIG_INCLUDE_DIRS
3333
)
3434

3535
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fcd_swig_doc.i)
36-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
36+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/fcd)
3737
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
3838

3939
set(GR_SWIG_LIBRARIES gnuradio-fcd)

gr-fec/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set(GR_SWIG_INCLUDE_DIRS
3131
)
3232

3333
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fec_swig_doc.i)
34-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
34+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/fec)
3535
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
3636
set(GR_SWIG_LIBRARIES gnuradio-fec)
3737

gr-filter/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ set(GR_SWIG_INCLUDE_DIRS
3333

3434
# FIXME: rename to filter_swig_doc.i when gnuradio-runtime is updated
3535
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/gr_filter_swig_doc.i)
36-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
36+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/filter)
3737
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
3838
set(GR_SWIG_TARGET_DEPS filter_generated_includes)
3939
set(GR_SWIG_LIBRARIES gnuradio-filter gnuradio-fft)

gr-noaa/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set(GR_SWIG_INCLUDE_DIRS
3030
)
3131

3232
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/noaa_swig_doc.i)
33-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
33+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/noaa)
3434
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
3535

3636
set(GR_SWIG_LIBRARIES gnuradio-noaa)

gr-pager/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set(GR_SWIG_INCLUDE_DIRS
3030
)
3131

3232
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/pager_swig_doc.i)
33-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
33+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/pager)
3434
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
3535

3636
set(GR_SWIG_LIBRARIES gnuradio-pager)

gr-qtgui/swig/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ set(GR_SWIG_INCLUDE_DIRS
3636
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/qtgui_swig_doc.i)
3737
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/qtgui)
3838
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
39-
list(APPEND GR_SWIG_TARGET_DEPS ${qtgui_moc_srcs})
4039

4140
set(GR_SWIG_LIBRARIES gnuradio-qtgui)
4241

gr-qtgui/swig/qtgui_swig.i

+4-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@
2929
%include "qtgui_swig_doc.i"
3030

3131
// So we understand the firdes window types
32-
%include "filter/firdes.h"
32+
%import "filter/firdes.h"
3333

3434
%{
35+
#include "qtgui/form_menus.h"
36+
#include "qtgui/DisplayPlot.h"
37+
#include "qtgui/displayform.h"
3538
#include "qtgui/sink_c.h"
3639
#include "qtgui/sink_f.h"
3740
#include "qtgui/time_sink_c.h"

gr-trellis/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ endif(ENABLE_GR_CTRLPORT)
4040
# Setup swig docs to depend on includes and pull in from build directory
4141
set(GR_SWIG_TARGET_DEPS trellis_generated_includes)
4242
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i)
43-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
43+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/trellis)
4444
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
4545

4646
GR_SWIG_MAKE(trellis_swig trellis_swig.i)

gr-uhd/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ set(GR_SWIG_INCLUDE_DIRS
3333
)
3434

3535
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/uhd_swig_doc.i)
36-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include)
36+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/uhd)
3737
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
3838

3939
link_directories(${UHD_LIBRARY_DIRS})

gr-video-sdl/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ endif(ENABLE_GR_CTRLPORT)
3939
# Setup swig docs to depend on includes and pull in from build directory
4040
set(GR_SWIG_TARGET_DEPS video_sdl_generated_includes)
4141
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/video_sdl_swig_doc.i)
42-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
42+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/video_sdl)
4343
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
4444

4545
set(GR_SWIG_LIBRARIES gnuradio-video-sdl)

gr-vocoder/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set(GR_SWIG_INCLUDE_DIRS
3030
)
3131

3232
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/vocoder_swig_doc.i)
33-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include)
33+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/vocoder)
3434
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
3535

3636
set(GR_SWIG_LIBRARIES gnuradio-vocoder)

gr-wxgui/swig/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if(ENABLE_GR_CTRLPORT)
3535
endif(ENABLE_GR_CTRLPORT)
3636

3737
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/wxgui_swig_doc.i)
38-
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
38+
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/wxgui)
3939
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
4040
set(GR_SWIG_TARGET_DEPS wxgui_generated_includes)
4141
set(GR_SWIG_LIBRARIES gnuradio-wxgui)

0 commit comments

Comments
 (0)