diff options
| author | Johnathan Corgan | 2012-01-02 11:17:29 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-01-02 11:17:29 -0800 |
| commit | 68301f5ef8af45bfcfe8b66cf75631f322267a7b (patch) | |
| tree | 7e710b49935962517339732d9df4b089edee1be0 /volk | |
| parent | dd84c8dfcb30617dbac56f49a57c1e363afe643b (diff) | |
| parent | d87f67134ab6c28bc932b63c5315c33b0e293fd4 (diff) | |
| download | gnuradio-68301f5ef8af45bfcfe8b66cf75631f322267a7b.tar.gz gnuradio-68301f5ef8af45bfcfe8b66cf75631f322267a7b.tar.bz2 gnuradio-68301f5ef8af45bfcfe8b66cf75631f322267a7b.zip | |
Merge branch 'master' into next
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") |