diff options
| author | Josh Blum | 2011-12-31 02:13:05 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-01-02 11:16:45 -0800 |
| commit | 4c6316e12456650b56fab2aa5bbca273a972b1c6 (patch) | |
| tree | 8e7abc91690c6a4c5af2cf882c94ac098c5a6d6b /volk | |
| parent | 2ed887b69a3b15840830998c4e6157176d427f60 (diff) | |
| download | gnuradio-4c6316e12456650b56fab2aa5bbca273a972b1c6.tar.gz gnuradio-4c6316e12456650b56fab2aa5bbca273a972b1c6.tar.bz2 gnuradio-4c6316e12456650b56fab2aa5bbca273a972b1c6.zip | |
volk: fix overrule detection (cant reply on cpu name)
Better detection for x86 and 32 or 64 bit.
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/lib/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
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") |