diff options
| author | Doug Geiger <doug.geiger@bioradiation.net> | 2014-09-18 14:39:51 -0400 |
|---|---|---|
| committer | Doug Geiger <doug.geiger@bioradiation.net> | 2014-09-18 14:39:51 -0400 |
| commit | 33a43b42c7ea3c318cbad3fe9372a32bc2bd127e (patch) | |
| tree | 05f8f39ee248054da162d506a49f5e5899f9c6a7 /volk/lib | |
| parent | 01deede32858ef9e2fe4cc937f3245b5b0e6d7c9 (diff) | |
Fix CMake abuse for assembly (.s) files
Diffstat (limited to 'volk/lib')
| -rw-r--r-- | volk/lib/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index 6cc4504cfa..202418af2d 100644 --- a/volk/lib/CMakeLists.txt +++ b/volk/lib/CMakeLists.txt @@ -409,7 +409,6 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.9") message(STATUS "--==>> -CFLAGS1: ${FULL_C_FLAGS}") string(REGEX MATCH "${ARCH}" ASM_ARCH "${FULL_C_FLAGS}") if( ASM_ARCH STREQUAL "armv7" ) - set(ASM-ATT $ENV{ASM}) message(STATUS "---- Adding ASM files") # we always use ATT syntax message(STATUS "-- Detected armv7 architecture; enabling ASM") # setup architecture specific assembler flags @@ -422,9 +421,9 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.9") message(STATUS "Adding source file: ${asm_file}") endforeach(asm_file) endif() - set(CMAKE_ASM-ATT_FLAGS_INIT ${ARCH_ASM_FLAGS}) - enable_language(ASM-ATT) # this must be after flags_init - message(STATUS "asm flags: ${CMAKE_ASM-ATT_FLAGS}") + set(CMAKE_ASM_FLAGS ${ARCH_ASM_FLAGS}) + enable_language(ASM) # this must be after flags_init + message(STATUS "asm flags: ${CMAKE_ASM_FLAGS}") endforeach(ARCH) else(${CMAKE_VERSION} VERSION_GREATER "2.8.9") |