Skip to content

Commit

Permalink
updated to volk v1.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
guruofquality committed May 4, 2016
1 parent 9b8a5b7 commit 0ad657a
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 75 deletions.
6 changes: 1 addition & 5 deletions BuildGNURadio.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
## * gqrx
############################################################

set(VOLK_BRANCH v1.2)
set(VOLK_BRANCH v1.2.2)
set(GNURADIO_BRANCH v3.7.9)
set(GR_RUNTIME_BRANCH gr-runtime-v3.7.9)
set(GR_POTHOS_BRANCH master)
Expand All @@ -27,10 +27,6 @@ message(STATUS "Configuring volk - ${VOLK_BRANCH}")
ExternalProject_Add(volk
GIT_REPOSITORY https://github.com/gnuradio/volk.git
GIT_TAG ${VOLK_BRANCH}
PATCH_COMMAND ${GIT_PATCH_HELPER} --git ${GIT_EXECUTABLE}
${PROJECT_SOURCE_DIR}/patches/volk_cpuid_count_for_msvc.diff
${PROJECT_SOURCE_DIR}/patches/volk_fix_msvc14.diff
${PROJECT_SOURCE_DIR}/patches/volk_qa_utils_config_h.diff
CMAKE_GENERATOR ${CMAKE_GENERATOR}
CMAKE_ARGS
-Wno-dev
Expand Down
3 changes: 0 additions & 3 deletions patches/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,5 @@
| GNURadio | gnuradio_fec_ldpc_config_h.diff | https://github.com/pothosware/gnuradio/issues/24 |
| GNURadio | gnuradio_grc_windows_paths.diff | https://github.com/pothosware/gnuradio/issues/27 |
| UHD | uhd_fix_gain_group_floor_round.diff | https://github.com/EttusResearch/uhd/issues/31 |
| VOLK | volk_cpuid_count_for_msvc.diff | https://github.com/pothosware/gnuradio/issues/17 |
| VOLK | volk_fix_msvc14.diff | Adds MSVC14 version string to CMake build |
| VOLK | volk_qa_utils_config_h.diff | https://github.com/pothosware/gnuradio/issues/15 |
| gr-rds | gr_rds_msvc_fixes.diff | Minor MSVC patches for encoder_impl.cc |
| zeromq | zeromq_readme_docs_path.diff | Do not install readme docs into the top directory |
30 changes: 0 additions & 30 deletions patches/volk_cpuid_count_for_msvc.diff

This file was deleted.

13 changes: 0 additions & 13 deletions patches/volk_fix_msvc14.diff

This file was deleted.

24 changes: 0 additions & 24 deletions patches/volk_qa_utils_config_h.diff

This file was deleted.

0 comments on commit 0ad657a

Please sign in to comment.