diff options
| author | Johnathan Corgan | 2012-01-02 11:17:24 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-01-02 11:17:24 -0800 |
| commit | d87f67134ab6c28bc932b63c5315c33b0e293fd4 (patch) | |
| tree | 96253547624f5b321497c39b54567cc3675a4160 | |
| parent | a64f22095bb5263fc939dec41eb0c00a26e0692a (diff) | |
| parent | 4c6316e12456650b56fab2aa5bbca273a972b1c6 (diff) | |
| download | gnuradio-d87f67134ab6c28bc932b63c5315c33b0e293fd4.tar.gz gnuradio-d87f67134ab6c28bc932b63c5315c33b0e293fd4.tar.bz2 gnuradio-d87f67134ab6c28bc932b63c5315c33b0e293fd4.zip | |
Merge branch 'maint'
| -rw-r--r-- | gnuradio-core/src/lib/filter/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_udp_sink.cc | 2 | ||||
| -rw-r--r-- | volk/lib/CMakeLists.txt | 12 |
3 files changed, 14 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/filter/CMakeLists.txt b/gnuradio-core/src/lib/filter/CMakeLists.txt index ce7e387c2..d26e55fb8 100644 --- a/gnuradio-core/src/lib/filter/CMakeLists.txt +++ b/gnuradio-core/src/lib/filter/CMakeLists.txt @@ -28,7 +28,7 @@ foreach(gr_core_filter_asm ${gr_core_filter_asms}) endforeach(gr_core_filter_asm) #detect 32 or 64 bit compiler -if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86|x86_64)$") +if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86|x86_64|amd64)$") include(CheckTypeSize) check_type_size("void*" SIZEOF_VOID_P BUILTIN_TYPES_ONLY) if (${SIZEOF_VOID_P} EQUAL 8) diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.cc b/gnuradio-core/src/lib/io/gr_udp_sink.cc index 36b4cbe36..9fc4da0ae 100644 --- a/gnuradio-core/src/lib/io/gr_udp_sink.cc +++ b/gnuradio-core/src/lib/io/gr_udp_sink.cc @@ -20,6 +20,8 @@ * Boston, MA 02110-1301, USA. */ +#include <boost/asio.hpp> + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index 092c3ba0d..1891996af 100644 --- a/volk/lib/CMakeLists.txt +++ b/volk/lib/CMakeLists.txt @@ -85,7 +85,17 @@ execute_process( #set the various overrule values (see archs.xml) #a lot of this is translating between automake and cmake if(NOT "${CROSSCOMPILE_MULTILIB}" STREQUAL "true") - set(MD_SUBCPU ${CMAKE_HOST_SYSTEM_PROCESSOR}) + set(MD_SUBCPU ${CMAKE_SYSTEM_PROCESSOR}) + #detect 32 or 64 bit compiler + if(MD_SUBCPU MATCHES "^(i.86|x86|x86_64|amd64)$") + include(CheckTypeSize) + check_type_size("void*" SIZEOF_VOID_P BUILTIN_TYPES_ONLY) + if (${SIZEOF_VOID_P} EQUAL 8) + set(MD_SUBCPU x86_64) + else() + set(MD_SUBCPU x86) + endif() + endif() endif() if(NOT "${ORC_FOUND}" STREQUAL "TRUE") set(LV_HAVE_ORC "no") |