diff options
| author | Martin Braun <martin.braun@ettus.com> | 2020-01-13 15:16:41 -0800 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2020-04-11 17:55:56 -0700 |
| commit | 80c04479da962d048d41165081b026aafdaa0316 (patch) | |
| tree | 75201fab3d612c86322840690a63b056c9cc0a57 /docs | |
| parent | bad1040058004cd193bfea31c544f41a7e6d12e3 (diff) | |
Remove VOLK as a submodule
This removes the volk/ submodule pointer and updates the CMake to detect
VOLK like any other dependency. The VOLK_MIN_VERSION CMake variable is
added (and set to 2.1.0).
The GR_VOLK_LIB variable is replaced with Volk::volk everywhere.
The VOLK_INSTALL_LIBRARY_DIR and VOLK_INSTALL_INCLUDE_DIR variables
weren't used and were removed.
CMake will now fail if VOLK cannot be detected. Therefore, ENABLE_VOLK
was also removed as a variable; all in-tree components may assume the
existence of VOLK.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/doxygen/Doxyfile.in | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index ccb7c4313c..c220bf2409 100644 --- a/docs/doxygen/Doxyfile.in +++ b/docs/doxygen/Doxyfile.in @@ -174,11 +174,7 @@ STRIP_FROM_INC_PATH = @CMAKE_SOURCE_DIR@/gnuradio-runtime/include \ @CMAKE_SOURCE_DIR@/gr-wavelet/include \ @CMAKE_BINARY_DIR@/gr-wavelet/include \ @CMAKE_SOURCE_DIR@/gr-zeromq/include \ - @CMAKE_BINARY_DIR@/gr-zeromq/include \ - @CMAKE_SOURCE_DIR@/volk/include \ - @CMAKE_BINARY_DIR@/volk/include \ - @CMAKE_SOURCE_DIR@/volk/tmpl \ - @CMAKE_BINARY_DIR@/volk/tmpl + @CMAKE_BINARY_DIR@/gr-zeromq/include # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter # (but less readable) file names. This can be useful if your file system @@ -726,9 +722,7 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = @abs_top_srcdir@/volk \ - @abs_top_builddir@/volk \ - @abs_top_builddir@/cmake/msvc \ +EXCLUDE = @abs_top_builddir@/cmake/msvc \ @abs_top_builddir@/docs/doxygen/html \ @abs_top_builddir@/docs/doxygen/xml \ @abs_top_builddir@/docs/doxygen/other/doxypy.py \ @@ -793,10 +787,7 @@ EXCLUDE = @abs_top_srcdir@/volk \ @abs_top_srcdir@/gr-wavelet/lib \ @abs_top_builddir@/gr-wavelet/lib \ @abs_top_srcdir@/gr-zeromq/lib \ - @abs_top_builddir@/gr-zeromq/lib \ - @abs_top_srcdir@/volk/cmake/msvc \ - @abs_top_builddir@/volk/cmake/msvc \ - @abs_top_srcdir@/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h + @abs_top_builddir@/gr-zeromq/lib # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded |