aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2015-09-11 15:24:37 -0700
committerMartin Braun <martin.braun@ettus.com>2015-09-11 15:24:37 -0700
commita09e0a31b73db3061f2e7c4a9813fe6963f95fb2 (patch)
tree642623e247b37685ab8fdb52539d84214b353e09 /host/lib
parent225526a9762b688418c34745e270bfccb4b0c507 (diff)
parentf7a15853324e3e0001c7a9e5bab397cb24e0e01f (diff)
downloaduhd-a09e0a31b73db3061f2e7c4a9813fe6963f95fb2.tar.gz
uhd-a09e0a31b73db3061f2e7c4a9813fe6963f95fb2.tar.bz2
uhd-a09e0a31b73db3061f2e7c4a9813fe6963f95fb2.zip
Merge branch 'maint'
Diffstat (limited to 'host/lib')
-rw-r--r--host/lib/convert/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/convert/CMakeLists.txt b/host/lib/convert/CMakeLists.txt
index 024c2260b..10376ba9c 100644
--- a/host/lib/convert/CMakeLists.txt
+++ b/host/lib/convert/CMakeLists.txt
@@ -60,7 +60,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
CHECK_INCLUDE_FILE_CXX(arm_neon.h HAVE_ARM_NEON_H)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-IF(HAVE_ARM_NEON_H)
+IF(HAVE_ARM_NEON_H AND (${CMAKE_SIZEOF_VOID_P} EQUAL 4))
ENABLE_LANGUAGE(ASM)
LIBUHD_APPEND_SOURCES(