diff options
| author | Johnathan Corgan | 2012-07-17 15:37:55 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-07-17 15:37:55 -0700 |
| commit | 7c8347ca47b51ddaef03ab1804a3d37716870643 (patch) | |
| tree | 5aa98c2e8821538235a3ff4ed2f74f8b521951f4 /volk/lib/CMakeLists.txt | |
| parent | 3d868e178994f2e147bbee2c26c09fe283ab6992 (diff) | |
| parent | cf8b2a8ff57ff6d3fd4b78a897854cc9a6f49fe1 (diff) | |
| download | gnuradio-7c8347ca47b51ddaef03ab1804a3d37716870643.tar.gz gnuradio-7c8347ca47b51ddaef03ab1804a3d37716870643.tar.bz2 gnuradio-7c8347ca47b51ddaef03ab1804a3d37716870643.zip | |
Merge remote branch 'jblum/volk_mmx_fix'
Diffstat (limited to 'volk/lib/CMakeLists.txt')
| -rw-r--r-- | volk/lib/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index 8288786c9..59d78b446 100644 --- a/volk/lib/CMakeLists.txt +++ b/volk/lib/CMakeLists.txt @@ -135,6 +135,12 @@ if(NOT CROSSCOMPILE_MULTILIB AND CPU_IS_x86) if (${SIZEOF_CPU} EQUAL 32) OVERRULE_ARCH(64 "CPU width is 32 bits") endif() + + #MSVC 64 bit does not have MMX, overrule it + if (${SIZEOF_CPU} EQUAL 64 AND MSVC) + OVERRULE_ARCH(mmx "No MMX for Win64") + endif() + endif() ######################################################################## @@ -159,7 +165,7 @@ execute_process( # When this occurs, eliminate the redundant machines # to avoid unnecessary compilation of subset machines. ######################################################################## -foreach(arch orc 64 32) +foreach(arch mmx orc 64 32) foreach(machine_name ${available_machines}) string(REPLACE "_${arch}" "" machine_name_no_arch ${machine_name}) if (${machine_name} STREQUAL ${machine_name_no_arch}) |