summaryrefslogtreecommitdiffstats
path: root/Modules/Compiler
diff options
context:
space:
mode:
authorGregor Jasny <gjasny@googlemail.com>2016-03-25 22:18:07 (GMT)
committerBrad King <brad.king@kitware.com>2016-03-29 13:19:10 (GMT)
commit9408a7a80259b94ac181171392849aeb944bfbb0 (patch)
tree59076200b90bbc171c95e1d39f16686c94856a1f /Modules/Compiler
parent06a8dc7003355c592471c64d7a88edc6917e6a12 (diff)
downloadCMake-9408a7a80259b94ac181171392849aeb944bfbb0.zip
CMake-9408a7a80259b94ac181171392849aeb944bfbb0.tar.gz
CMake-9408a7a80259b94ac181171392849aeb944bfbb0.tar.bz2
ASM: Add missing <INCLUDES> placeholder for "compile" rules
This placeholder was added to the compilation rules for other languages by commit v3.4.0-rc1~342^2 (Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables, 2015-07-13) but ASM was incorrectly left out. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
Diffstat (limited to 'Modules/Compiler')
-rw-r--r--Modules/Compiler/ARMCC-ASM.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Compiler/ARMCC-ASM.cmake b/Modules/Compiler/ARMCC-ASM.cmake
index 8e3cfc5..539d525 100644
--- a/Modules/Compiler/ARMCC-ASM.cmake
+++ b/Modules/Compiler/ARMCC-ASM.cmake
@@ -3,5 +3,5 @@ include(Compiler/ARMCC)
set(CMAKE_ASM_OUTPUT_EXTENSION ".o")
set(CMAKE_ASM_OUTPUT_EXTENSION_REPLACE 1)
-set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <FLAGS> -o <OBJECT> <SOURCE>")
+set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>")
set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)