diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-09-11 15:24:37 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-09-11 15:24:37 -0700 |
| commit | a09e0a31b73db3061f2e7c4a9813fe6963f95fb2 (patch) | |
| tree | 642623e247b37685ab8fdb52539d84214b353e09 /host | |
| parent | 225526a9762b688418c34745e270bfccb4b0c507 (diff) | |
| parent | f7a15853324e3e0001c7a9e5bab397cb24e0e01f (diff) | |
| download | uhd-a09e0a31b73db3061f2e7c4a9813fe6963f95fb2.tar.gz uhd-a09e0a31b73db3061f2e7c4a9813fe6963f95fb2.tar.bz2 uhd-a09e0a31b73db3061f2e7c4a9813fe6963f95fb2.zip | |
Merge branch 'maint'
Diffstat (limited to 'host')
| -rw-r--r-- | host/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/lib/convert/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 5736acf90..7f7d58658 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -269,8 +269,8 @@ UHD_INSTALL(FILES #{{{IMG_SECTION # This section is written automatically by /images/create_imgs_package.py # Any manual changes in here will be overwritten. -SET(UHD_IMAGES_MD5SUM "033ee49251ee21be656f2fe7546fbbb2") -SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.009.000-16-g5284e247.zip") +SET(UHD_IMAGES_MD5SUM "2ff397927220f591f377a04c9e9e8b7e") +SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.009.001-release.zip") #}}} ######################################################################## 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( |