summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau2011-10-20 12:15:04 -0700
committerTom Rondeau2011-10-20 12:15:04 -0700
commitc643c9b022ef9c8afd4d32f91927f120a92b2ead (patch)
tree67e87a741c388035e9ca128ac702597efbc3ddfb
parent9925e69cdaedbcf373145199355d655880e65cdc (diff)
parent793e9070ce7d88b818b3f4d8809a07fdf50afda0 (diff)
downloadgnuradio-c643c9b022ef9c8afd4d32f91927f120a92b2ead.tar.gz
gnuradio-c643c9b022ef9c8afd4d32f91927f120a92b2ead.tar.bz2
gnuradio-c643c9b022ef9c8afd4d32f91927f120a92b2ead.zip
Merge branch 'next' of gnuradio.org:gnuradio into next
-rw-r--r--gnuradio-core/src/lib/filter/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/filter/CMakeLists.txt b/gnuradio-core/src/lib/filter/CMakeLists.txt
index da16cd60b..ce7e387c2 100644
--- a/gnuradio-core/src/lib/filter/CMakeLists.txt
+++ b/gnuradio-core/src/lib/filter/CMakeLists.txt
@@ -166,7 +166,7 @@ if(CMAKE_SYSTEM_PROCESSOR_x86)
)
endif()
-if(CMAKE_SYSTEM_PROCESSOR_x86 AND ${CMAKE_SYSTEM_PROCESSOR_x86} EQUAL 64)
+if(CMAKE_SYSTEM_PROCESSOR_x86 AND "${CMAKE_SYSTEM_PROCESSOR_x86}" STREQUAL "64")
list(APPEND gnuradio_core_sources
${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_sse64.S
${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_3dnow64.S
@@ -180,7 +180,7 @@ if(CMAKE_SYSTEM_PROCESSOR_x86 AND ${CMAKE_SYSTEM_PROCESSOR_x86} EQUAL 64)
${CMAKE_CURRENT_SOURCE_DIR}/fcomplex_dotprod_sse64.S
${CMAKE_CURRENT_SOURCE_DIR}/short_dotprod_mmx64.S
)
-elseif(CMAKE_SYSTEM_PROCESSOR_x86 AND ${CMAKE_SYSTEM_PROCESSOR_x86} EQUAL 32)
+elseif(CMAKE_SYSTEM_PROCESSOR_x86 AND "${CMAKE_SYSTEM_PROCESSOR_x86}" STREQUAL "32")
list(APPEND gnuradio_core_sources
${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_sse.S
${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_3dnow.S