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 /gr-blocks/lib | |
| 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 'gr-blocks/lib')
| -rw-r--r-- | gr-blocks/lib/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 8c9dd9aa6a..45cf72b579 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -175,9 +175,9 @@ add_library(gnuradio-blocks ) target_link_libraries(gnuradio-blocks - gnuradio-runtime - ${GR_VOLK_LIB} - ) + gnuradio-runtime + Volk::volk +) target_include_directories(gnuradio-blocks PUBLIC |