[Commit-gnuradio] [gnuradio] 04/07: volk: calling enable_languages here is buggy until 2.8.10. Version checking for that.

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 00edd3c48d004527d6a43a5c66f75bc6ca3bbbfc
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 28 13:50:52 2014 -0400

    volk: calling enable_languages here is buggy until 2.8.10. Version checking 
for that.
---
 volk/lib/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
index 4713a29..5a38a28 100644
--- a/volk/lib/CMakeLists.txt
+++ b/volk/lib/CMakeLists.txt
@@ -385,6 +385,7 @@ include_directories(
 # Handle ASM support
 #  on by default, but let users turn it off
 ########################################################################
+if(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
 set(ASM_ARCHS_AVAILABLE "armv7")
 if( NOT DEFINED ENABLE_ASM OR ENABLE_ASM )
     # sort through a list of all architectures we have ASM for
@@ -408,11 +409,14 @@ if( NOT DEFINED ENABLE_ASM OR ENABLE_ASM )
         endif()
         set(CMAKE_ASM-ATT_FLAGS_INIT ${ARCH_ASM_FLAGS})
         enable_language(ASM-ATT) # this must be after flags_init
-        message(STATUS "asm flags are ${CMAKE_ASM-ATT_FLAGS}")
+        message(STATUS "asm flags: ${CMAKE_ASM-ATT_FLAGS}")
     endforeach(ARCH)
 else()
     message("---- NOT Adding ASM files")
 endif()
+else(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
+    message(STATUS "Not enabling ASM support. CMake >= 2.8.10 required.")
+endif(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
 
 ########################################################################
 # Handle orc support