diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-29 13:24:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-03-29 13:24:39 (GMT) |
| commit | 90f24f016e93d18f6a244b39fd21c68355bdbe48 (patch) | |
| tree | 7590364393f109a4847f9789a82fd0754c08871c /Modules/Compiler | |
| parent | 2ab344a1dcfcc91cf7337cd700af827a60fec811 (diff) | |
| parent | 9408a7a80259b94ac181171392849aeb944bfbb0 (diff) | |
| download | CMake-90f24f016e93d18f6a244b39fd21c68355bdbe48.zip CMake-90f24f016e93d18f6a244b39fd21c68355bdbe48.tar.gz CMake-90f24f016e93d18f6a244b39fd21c68355bdbe48.tar.bz2 | |
Merge topic 'asm-includes'
9408a7a8 ASM: Add missing <INCLUDES> placeholder for "compile" rules
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/ARMCC-ASM.cmake | 2 |
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) |