summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-07-28 13:50:52 -0400
committerTom Rondeau <tom@trondeau.com>2014-07-28 13:50:52 -0400
commit00edd3c48d004527d6a43a5c66f75bc6ca3bbbfc (patch)
treed42ff7d6791f9eb94fadbf45735a7d3b41e66a39
parente20ba633b19373ce908d71aa93966bd7241d5988 (diff)
volk: calling enable_languages here is buggy until 2.8.10. Version checking for that.
-rw-r--r--volk/lib/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
index 4713a29689..5a38a286e9 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