summaryrefslogtreecommitdiff
path: root/volk
diff options
context:
space:
mode:
authorJohnathan Corgan2012-08-30 17:06:00 -0700
committerJohnathan Corgan2012-08-30 17:06:00 -0700
commit873585ccd45c6362c5f17d71021f15edd798785b (patch)
tree7d39bf1110153b3d9f78b997aac210dfd7cd9190 /volk
parentef6648763589d389c0e95d62f524e46b32dd597c (diff)
parentc93ed1c9eb01027aee04f567b7541738b2aa8bda (diff)
downloadgnuradio-873585ccd45c6362c5f17d71021f15edd798785b.tar.gz
gnuradio-873585ccd45c6362c5f17d71021f15edd798785b.tar.bz2
gnuradio-873585ccd45c6362c5f17d71021f15edd798785b.zip
Merge branch 'maint'
Diffstat (limited to 'volk')
-rw-r--r--volk/lib/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
index 58bf026b4..d9aeb797c 100644
--- a/volk/lib/CMakeLists.txt
+++ b/volk/lib/CMakeLists.txt
@@ -93,7 +93,9 @@ macro(check_arch arch_name)
COMMAND ${PYTHON_EXECUTABLE} -c "import re; print(re.sub('\\W', '_', '${have_flag}'))"
OUTPUT_VARIABLE have_flag OUTPUT_STRIP_TRAILING_WHITESPACE
)
- set(CMAKE_REQUIRED_FLAGS VOLK_FLAG_CHECK_FLAGS)
+ if(VOLK_FLAG_CHECK_FLAGS)
+ set(CMAKE_REQUIRED_FLAGS VOLK_FLAG_CHECK_FLAGS)
+ endif()
CHECK_CXX_COMPILER_FLAG(${flag} ${have_flag})
unset(CMAKE_REQUIRED_FLAGS)
if (NOT ${have_flag})