diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-31 17:23:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-31 17:23:16 (GMT) |
| commit | 8f8a0bfbf5a0029430c98feeadc25ab973ff5e38 (patch) | |
| tree | e52e337607c6a6c8d52cf2380290d5085927bcbc | |
| parent | 8fdb2c5a5da52bf74ccb33cbc7149cb33cb88a81 (diff) | |
| parent | 677c091b8140a0655f512b8283c5b120fbd0f99c (diff) | |
| download | CMake-8f8a0bfbf5a0029430c98feeadc25ab973ff5e38.zip CMake-8f8a0bfbf5a0029430c98feeadc25ab973ff5e38.tar.gz CMake-8f8a0bfbf5a0029430c98feeadc25ab973ff5e38.tar.bz2 | |
Merge branch 'backport-asm-includes' into release
| -rw-r--r-- | Modules/CMakeASM-ATTInformation.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeASM_NASMInformation.cmake | 2 | ||||
| -rw-r--r-- | Modules/Compiler/ARMCC-ASM.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/Generic-ADSP-ASM.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/gas.cmake | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Modules/CMakeASM-ATTInformation.cmake b/Modules/CMakeASM-ATTInformation.cmake index 675c13b..07a2d38 100644 --- a/Modules/CMakeASM-ATTInformation.cmake +++ b/Modules/CMakeASM-ATTInformation.cmake @@ -19,7 +19,7 @@ set(ASM_DIALECT "-ATT") # assembler but should be processed by gcc set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS s;asm) -set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> -o <OBJECT> <SOURCE>") +set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>") include(CMakeASMInformation) set(ASM_DIALECT) diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake index 7058fc7..146f412 100644 --- a/Modules/CMakeASM_NASMInformation.cmake +++ b/Modules/CMakeASM_NASMInformation.cmake @@ -38,7 +38,7 @@ if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT) endif() endif() -set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>") +set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>") # Load the generic ASMInformation file: set(ASM_DIALECT "_NASM") 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) diff --git a/Modules/Platform/Generic-ADSP-ASM.cmake b/Modules/Platform/Generic-ADSP-ASM.cmake index 63a1388..e718bec 100644 --- a/Modules/Platform/Generic-ADSP-ASM.cmake +++ b/Modules/Platform/Generic-ADSP-ASM.cmake @@ -3,5 +3,5 @@ include(Platform/Generic-ADSP-Common) set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm) set(CMAKE_ASM_OUTPUT_EXTENSION ".doj" ) set(CMAKE_ASM_COMPILE_OBJECT - "<CMAKE_ASM_COMPILER> <FLAGS> -proc ${ADSP_PROCESSOR} -si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -o <OBJECT> <SOURCE>") + "<CMAKE_ASM_COMPILER> <INCLUDES> <FLAGS> -proc ${ADSP_PROCESSOR} -si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -o <OBJECT> <SOURCE>") diff --git a/Modules/Platform/gas.cmake b/Modules/Platform/gas.cmake index 7d2bc84..7c659f2 100644 --- a/Modules/Platform/gas.cmake +++ b/Modules/Platform/gas.cmake @@ -4,7 +4,7 @@ else() set(CMAKE_ASM${ASM_DIALECT}_OUTPUT_EXTENSION .obj) endif() -set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> -o <OBJECT> <SOURCE>") +set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>") set(CMAKE_ASM${ASM_DIALECT}_CREATE_STATIC_LIBRARY "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> " |