diff options
author | Brad King <brad.king@kitware.com> | 2017-05-24 14:37:30 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-24 14:37:33 (GMT) |
commit | 20b892d9a29880de9c0bb4f07f3f347c30b88bb1 (patch) | |
tree | 6ea530ecaea120bd14289fc8beb1c63852bbfd5f /Modules | |
parent | 5e0858cc15d91cb1364f7fcba2cd92519adf0a19 (diff) | |
parent | 68ea936ff5650155c31438da8e7838e05d0e119f (diff) | |
download | CMake-20b892d9a29880de9c0bb4f07f3f347c30b88bb1.zip CMake-20b892d9a29880de9c0bb4f07f3f347c30b88bb1.tar.gz CMake-20b892d9a29880de9c0bb4f07f3f347c30b88bb1.tar.bz2 |
Merge topic 'IAR-response-flag-space'
68ea936f Added space after IAR response file flag
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !880
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/Compiler/IAR-C.cmake | 2 | ||||
-rw-r--r-- | Modules/Compiler/IAR-CXX.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Compiler/IAR-C.cmake b/Modules/Compiler/IAR-C.cmake index f1b6ff7..f65b0c7 100644 --- a/Modules/Compiler/IAR-C.cmake +++ b/Modules/Compiler/IAR-C.cmake @@ -7,7 +7,7 @@ set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <SOURCE> <DEFINES> <I set(CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <SOURCE> <DEFINES> <INCLUDES> <FLAGS> --preprocess=cnl <PREPROCESSED_SOURCE>") set(CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -lAH <ASSEMBLY_SOURCE> -o <OBJECT>.dummy") -set(CMAKE_C_RESPONSE_FILE_LINK_FLAG "-f") +set(CMAKE_C_RESPONSE_FILE_LINK_FLAG "-f ") set(CMAKE_DEPFILE_FLAGS_C "--dependencies=ns <DEPFILE>") # The toolchains for ARM and AVR are quite different: diff --git a/Modules/Compiler/IAR-CXX.cmake b/Modules/Compiler/IAR-CXX.cmake index ffb144f..f49968e 100644 --- a/Modules/Compiler/IAR-CXX.cmake +++ b/Modules/Compiler/IAR-CXX.cmake @@ -7,7 +7,7 @@ set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <SOURCE> <DEFINES> <INCLUDES set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <SOURCE> <DEFINES> <INCLUDES> <FLAGS> --preprocess=cnl <PREPROCESSED_SOURCE>") set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -lAH <ASSEMBLY_SOURCE> -o <OBJECT>.dummy") -set(CMAKE_CXX_RESPONSE_FILE_LINK_FLAG "-f") +set(CMAKE_CXX_RESPONSE_FILE_LINK_FLAG "-f ") set(CMAKE_DEPFILE_FLAGS_CXX "--dependencies=ns <DEPFILE>") if("${IAR_TARGET_ARCHITECTURE}" STREQUAL "ARM") |