[Cmake-commits] CMake branch, next, updated. v3.6.1-1297-g2e928b1

[Brad King]

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  2e928b19d912dcb7db0c6b10a89a35c5b5e2462d (commit)
       via  03d5ae0b37adc3fd12fa2bdb6b96252182f48d2a (commit)
       via  08f570b7fb76c1895663ae8665d2494c988069b4 (commit)
      from  15df44b216c93a123bcb005b33795e20e49f11f8 (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=2e928b19d912dcb7db0c6b10a89a35c5b5e2462d
commit 2e928b19d912dcb7db0c6b10a89a35c5b5e2462d
Merge: 15df44b 03d5ae0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 17 13:39:46 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 17 13:39:46 2016 -0400

    Merge topic 'msvc-suppress-rc-logo' into next
    
    03d5ae0b Merge branch 'minor-cleanups' into msvc-suppress-rc-logo
    08f570b7 MSVC: Suppress rc.exe logo/banner when CMAKE_VERBOSE_MAKEFILE is false


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03d5ae0b37adc3fd12fa2bdb6b96252182f48d2a
commit 03d5ae0b37adc3fd12fa2bdb6b96252182f48d2a
Merge: 08f570b 27591a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 17 13:30:35 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 17 13:30:35 2016 -0400

    Merge branch 'minor-cleanups' into msvc-suppress-rc-logo


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08f570b7fb76c1895663ae8665d2494c988069b4
commit 08f570b7fb76c1895663ae8665d2494c988069b4
Author:     Taylor Braun-Jones <taylor at braun-jones.org>
AuthorDate: Tue Aug 16 12:36:49 2016 -0400
Commit:     Taylor Braun-Jones <taylor at braun-jones.org>
CommitDate: Wed Aug 17 11:49:12 2016 -0400

    MSVC: Suppress rc.exe logo/banner when CMAKE_VERBOSE_MAKEFILE is false
    
    This matches the current behavior for cl.exe.
    
    Closes: #16246

diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake
index 60276e2..8e320da 100644
--- a/Modules/CMakeRCInformation.cmake
+++ b/Modules/CMakeRCInformation.cmake
@@ -44,7 +44,7 @@ set(CMAKE_INCLUDE_FLAG_RC "-I")
 # compile a Resource file into an object file
 if(NOT CMAKE_RC_COMPILE_OBJECT)
   set(CMAKE_RC_COMPILE_OBJECT
-    "<CMAKE_RC_COMPILER> <DEFINES> <INCLUDES> <FLAGS> /fo<OBJECT> <SOURCE>")
+    "<CMAKE_RC_COMPILER> ${CMAKE_CL_NOLOGO} <DEFINES> <INCLUDES> <FLAGS> /fo<OBJECT> <SOURCE>")
 endif()
 
 mark_as_advanced(

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

Summary of changes:
 Modules/CMakeRCInformation.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake