[Cmake-commits] CMake branch, master, updated. v3.8.1-1283-g43d9b29

[Kitware Robot]

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, master has been updated
       via  43d9b296f5688b865bc2c40ea0af3b042047dfe8 (commit)
       via  9f552e2e5aa1b7ff9604e88d19fa0515a9b37be1 (commit)
       via  20b892d9a29880de9c0bb4f07f3f347c30b88bb1 (commit)
       via  68ea936ff5650155c31438da8e7838e05d0e119f (commit)
       via  67a7e090f801bafd2b3a4933104890ee7b299cbd (commit)
       via  abe8a623d99d2073c078e8cc94a9074c249b4d36 (commit)
      from  5e0858cc15d91cb1364f7fcba2cd92519adf0a19 (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=43d9b296f5688b865bc2c40ea0af3b042047dfe8
commit 43d9b296f5688b865bc2c40ea0af3b042047dfe8
Merge: 9f552e2 67a7e09
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 24 10:39:11 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 24 10:39:11 2017 -0400

    Merge branch 'release'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f552e2e5aa1b7ff9604e88d19fa0515a9b37be1
commit 9f552e2e5aa1b7ff9604e88d19fa0515a9b37be1
Merge: 20b892d abe8a62
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 24 14:37:47 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed May 24 10:37:51 2017 -0400

    Merge topic 'vs15-GNUtoMS'
    
    abe8a623 GNUtoMS: Add search path for VS 2017 environment scripts
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !875


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20b892d9a29880de9c0bb4f07f3f347c30b88bb1
commit 20b892d9a29880de9c0bb4f07f3f347c30b88bb1
Merge: 5e0858c 68ea936
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 24 14:37:30 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed May 24 10:37:33 2017 -0400

    Merge topic 'IAR-response-flag-space'
    
    68ea936f Added space after IAR response file flag
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !880


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68ea936ff5650155c31438da8e7838e05d0e119f
commit 68ea936ff5650155c31438da8e7838e05d0e119f
Author:     Andreas Weis <der_ghulbus at ghulbus-inc.de>
AuthorDate: Tue May 23 07:25:27 2017 +0200
Commit:     Andreas Weis <der_ghulbus at ghulbus-inc.de>
CommitDate: Tue May 23 07:25:27 2017 +0200

    Added space after IAR response file flag
    
    Without the space between the flag and the filename, IAR will fail to
    parse the arguments correctly.

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")

-----------------------------------------------------------------------

Summary of changes:
 Modules/Compiler/IAR-C.cmake       |    2 +-
 Modules/Compiler/IAR-CXX.cmake     |    2 +-
 Modules/Platform/Windows-GNU.cmake |   15 +++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake