[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 07/14: volk: force some support required fo
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 07/14: volk: force some support required for android builds; boost unit tests not working yet. |
|
Date: |
Thu, 12 Mar 2015 19:38:13 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch android
in repository gnuradio.
commit eea41aa1bade914c404825879364939e86151344
Author: Tom Rondeau <address@hidden>
Date: Wed Dec 31 15:09:02 2014 -0500
volk: force some support required for android builds; boost unit tests not
working yet.
---
volk/lib/CMakeLists.txt | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
index 37915e5..f20a38e 100644
--- a/volk/lib/CMakeLists.txt
+++ b/volk/lib/CMakeLists.txt
@@ -40,6 +40,9 @@ if(HAVE_DLFCN_H)
list(APPEND volk_libraries ${CMAKE_DL_LIBS})
endif()
+# REQUIRED FOR ANDROID BUILDS
+list(APPEND volk_libraries m)
+
########################################################################
# Setup the compiler name
########################################################################
@@ -411,7 +414,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
message(STATUS "---- Adding ASM files") # we always use ATT syntax
message(STATUS "-- Detected armv7 architecture; enabling ASM")
# setup architecture specific assembler flags
- set(ARCH_ASM_FLAGS "-mfpu=neon -g")
+ set(ARCH_ASM_FLAGS "-march=armv7-a -mfpu=neon -g")
# then add the files
include_directories(${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon)
file(GLOB asm_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
@@ -545,7 +548,7 @@ endif(ENABLE_STATIC_LIBS)
# Build the QA test application
########################################################################
-
+if(NOT ANDROID)
if(Boost_FOUND)
set_source_files_properties(
@@ -564,3 +567,4 @@ if(Boost_FOUND)
add_test(qa_volk_test_all test_all)
endif(Boost_FOUND)
+endif(NOT ANDROID)
\ No newline at end of file
- [Commit-gnuradio] [gnuradio] 04/14: runtime: android: issues related to vmcircbuf; only mmap_tmpfile version working currently., (continued)
- [Commit-gnuradio] [gnuradio] 04/14: runtime: android: issues related to vmcircbuf; only mmap_tmpfile version working currently., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 09/14: runtime: trying to use ANDROID to define certain behavior, git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 11/14: fft: defined a setting for the FFTW plan options if android or not., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 02/14: logger: android: adding Android log functions for different logging levels., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 13/14: runtime: android: more conversion of statics vars to static functions., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 12/14: runtime: android: need to use a usable, writable location for android apps, so use the tmp path that we set up to point to the app's home directory., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 06/14: volk: using hypot instead of cabsf., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 10/14: cmake: changed to using C checks for headers instead of C++., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 01/14: cmake: android: adding exceptions and atomic to Boost deps; ordering in this patch is important., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 03/14: runtime: android: Android does not support pthread_setaffinity_np; turned this into a nop call., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 07/14: volk: force some support required for android builds; boost unit tests not working yet.,
git <=
- [Commit-gnuradio] [gnuradio] 14/14: cmake: android: adding toolchain file for building., git, 2015/03/12