• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/gnuradio/0001-suppress-boost_unitest-detection.patch
Gwenhael Goavec-MerouGwenhael Goavec-Merou committed c13dc76c1d113 Mar 2015
Raw file
Source viewDiff to previous
 
1
By default, the boost test option is mandatory for build environment
2
detection. 
3
This patch suppress this dependency and allows the test part only if
4
build_test is enabled at the Buildroot level.
5
​
6
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
7
---
8
Index: gnuradio-3.7.5/volk/cmake/VolkBoost.cmake
9
===================================================================
10
--- gnuradio-3.7.5.orig/volk/cmake/VolkBoost.cmake
11
+++ gnuradio-3.7.5/volk/cmake/VolkBoost.cmake
12
@@ -29,7 +29,6 @@ set(__INCLUDED_VOLK_BOOST_CMAKE TRUE)
13
 set(BOOST_REQUIRED_COMPONENTS
14
     filesystem
15
     system
16
-    unit_test_framework
17
     program_options
18
 )
19
 
20
Index: gnuradio-3.7.5/volk/lib/CMakeLists.txt
21
===================================================================
22
--- gnuradio-3.7.5.orig/volk/lib/CMakeLists.txt
23
+++ gnuradio-3.7.5/volk/lib/CMakeLists.txt
24
@@ -540,8 +540,9 @@ endif(ENABLE_STATIC_LIBS)
25
 # Build the QA test application
26
 ########################################################################
27
 
28
+find_package(Boost "1.35" COMPONENTS "unit_test_framework")
29
 
30
-if(Boost_FOUND)
31
+if(Boost_FOUND AND BUILD_TEST)
32
 
33
     set_source_files_properties(
34
         ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc PROPERTIES
35
@@ -558,4 +559,4 @@ if(Boost_FOUND)
36
     target_link_libraries(test_all volk ${Boost_LIBRARIES})
37
     add_test(qa_volk_test_all test_all)
38
 
39
-endif(Boost_FOUND)
40
+endif(Boost_FOUND AND BUILD_TEST)
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.