diff options
| author | Josh Blum <josh@joshknows.com> | 2011-12-31 02:13:05 -0800 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-01-02 11:16:45 -0800 |
| commit | 4c6316e12456650b56fab2aa5bbca273a972b1c6 (patch) | |
| tree | 8e7abc91690c6a4c5af2cf882c94ac098c5a6d6b | |
| parent | 2ed887b69a3b15840830998c4e6157176d427f60 (diff) | |
volk: fix overrule detection (cant reply on cpu name)
Better detection for x86 and 32 or 64 bit.
| -rw-r--r-- | gnuradio-core/src/lib/filter/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | volk/lib/CMakeLists.txt | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/filter/CMakeLists.txt b/gnuradio-core/src/lib/filter/CMakeLists.txt index ce7e387c28..d26e55fb85 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/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index 092c3ba0d7..1891996af6 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") |