[Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-12-g72a585d
Brad King
brad.king at kitware.com
Wed Feb 3 14:36:00 EST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 72a585d3534616b0cf4b241d3b6eeb50f44da79a (commit)
via 99a9c7e51a3980807c60a9ec7532db0ca9495e5f (commit)
from 47bd1c7197d01ebca3239efc4223db2082be2340 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72a585d3534616b0cf4b241d3b6eeb50f44da79a
commit 72a585d3534616b0cf4b241d3b6eeb50f44da79a
Merge: 47bd1c7 99a9c7e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 3 14:35:59 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 3 14:35:59 2016 -0500
Merge topic 'iar_ninja_support' into next
99a9c7e5 IAR: Add support for using this compiler with the Ninja generator
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99a9c7e51a3980807c60a9ec7532db0ca9495e5f
commit 99a9c7e51a3980807c60a9ec7532db0ca9495e5f
Author: Juhani Simola <ext_juhani.simola at suunto.com>
AuthorDate: Sat Jan 30 20:54:26 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 3 14:35:06 2016 -0500
IAR: Add support for using this compiler with the Ninja generator
The dependency flags require recent versions of `iccarm` and `iccavr`.
The multi-rule dependency generated with `--dependencies=m` does not
work well with Ninja, so use `--dependencies=ns` instead.
diff --git a/Modules/Compiler/IAR-C.cmake b/Modules/Compiler/IAR-C.cmake
index d2c7df9..f1b6ff7 100644
--- a/Modules/Compiler/IAR-C.cmake
+++ b/Modules/Compiler/IAR-C.cmake
@@ -7,6 +7,9 @@ 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_DEPFILE_FLAGS_C "--dependencies=ns <DEPFILE>")
+
# The toolchains for ARM and AVR are quite different:
if("${IAR_TARGET_ARCHITECTURE}" STREQUAL "ARM")
diff --git a/Modules/Compiler/IAR-CXX.cmake b/Modules/Compiler/IAR-CXX.cmake
index 03ecdf1..ffb144f 100644
--- a/Modules/Compiler/IAR-CXX.cmake
+++ b/Modules/Compiler/IAR-CXX.cmake
@@ -7,7 +7,8 @@ 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_DEPFILE_FLAGS_CXX "--dependencies=ns <DEPFILE>")
if("${IAR_TARGET_ARCHITECTURE}" STREQUAL "ARM")
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/IAR-C.cmake | 3 +++
Modules/Compiler/IAR-CXX.cmake | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list