[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 08/14: volk: Using C checks for Volk C FLag
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 08/14: volk: Using C checks for Volk C FLags instead of CXX. |
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 e1de6be91cfcdf58e25649a1d4119b6c8611abda
Author: Tom Rondeau <address@hidden>
Date: Fri Jan 2 17:27:11 2015 -0500
volk: Using C checks for Volk C FLags instead of CXX.
---
volk/lib/CMakeLists.txt | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
index f20a38e..3da55bd 100644
--- a/volk/lib/CMakeLists.txt
+++ b/volk/lib/CMakeLists.txt
@@ -40,8 +40,11 @@ if(HAVE_DLFCN_H)
list(APPEND volk_libraries ${CMAKE_DL_LIBS})
endif()
-# REQUIRED FOR ANDROID BUILDS
-list(APPEND volk_libraries m)
+
+if(ANDROID)
+ list(APPEND volk_libraries m log)
+endif(ANDROID)
+
########################################################################
# Setup the compiler name
@@ -102,7 +105,7 @@ macro(check_arch arch_name)
set(flags ${ARGN})
set(have_${arch_name} TRUE)
foreach(flag ${flags})
- include(CheckCXXCompilerFlag)
+ include(CheckCCompilerFlag)
set(have_flag have${flag})
execute_process( #make the have_flag have nice alphanum chars (just
for looks/not necessary)
COMMAND ${PYTHON_EXECUTABLE} -c "import re; print(re.sub('\\W',
'_', '${have_flag}'))"
@@ -111,7 +114,7 @@ macro(check_arch arch_name)
if(VOLK_FLAG_CHECK_FLAGS)
set(CMAKE_REQUIRED_FLAGS ${VOLK_FLAG_CHECK_FLAGS})
endif()
- CHECK_CXX_COMPILER_FLAG(${flag} ${have_flag})
+ CHECK_C_COMPILER_FLAG(${flag} ${have_flag})
unset(CMAKE_REQUIRED_FLAGS)
if (NOT ${have_flag})
set(have_${arch_name} FALSE)
- [Commit-gnuradio] [gnuradio] branch android created (now 1e31c64), git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 08/14: volk: Using C checks for Volk C FLags instead of CXX.,
git <=
- [Commit-gnuradio] [gnuradio] 05/14: fft: android: problems with wisdom files and MEASURE version of FFTW. Defaulting to suboptimal ESTIMATE until we figure it out., git, 2015/03/12
- [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