aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2014-06-03 14:41:53 -0700
committerNicholas Corgan <nick.corgan@ettus.com>2014-06-03 14:41:53 -0700
commit8faf5bc4999c14681c3edbcd585175f749c1969d (patch)
tree0a36d4af60502aa060937e02716cbbc32e1317c7
parent383061d8e6520ac50ed6a78059e460048757d989 (diff)
parent57486eb4bcab31fc522eabefcb0b199230586317 (diff)
downloaduhd-8faf5bc4999c14681c3edbcd585175f749c1969d.tar.gz
uhd-8faf5bc4999c14681c3edbcd585175f749c1969d.tar.bz2
uhd-8faf5bc4999c14681c3edbcd585175f749c1969d.zip
Merge branch 'maint'
-rw-r--r--host/lib/convert/CMakeLists.txt7
1 files changed, 0 insertions, 7 deletions
diff --git a/host/lib/convert/CMakeLists.txt b/host/lib/convert/CMakeLists.txt
index 00e129b78..473b7f59f 100644
--- a/host/lib/convert/CMakeLists.txt
+++ b/host/lib/convert/CMakeLists.txt
@@ -90,17 +90,10 @@ ENDIF(HAVE_EMMINTRIN_H)
# Check for NEON SIMD headers
########################################################################
IF(CMAKE_COMPILER_IS_GNUCXX)
- SET(NEON_FLAGS "-mfloat-abi=softfp -mfpu=neon")
- SET(CMAKE_REQUIRED_FLAGS ${NEON_FLAGS})
CHECK_INCLUDE_FILE_CXX(arm_neon.h HAVE_ARM_NEON_H)
- UNSET(CMAKE_REQUIRED_FLAGS)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
IF(HAVE_ARM_NEON_H)
- SET_SOURCE_FILES_PROPERTIES(
- ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
- PROPERTIES COMPILE_FLAGS "${NEON_FLAGS}"
- )
LIBUHD_APPEND_SOURCES(
${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
)