[Cmake-commits] CMake branch, next, updated. v3.6.1-1304-g3932f9c

[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  3932f9cf5e3ffad641988e6f36abd69c02667fe7 (commit)
       via  cca431403460e5d23b38ad528812dadd03e8c82c (commit)
      from  1cca31b2f5b2ac7ba21711fbe612b37d1ecc6b6c (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=3932f9cf5e3ffad641988e6f36abd69c02667fe7
commit 3932f9cf5e3ffad641988e6f36abd69c02667fe7
Merge: 1cca31b cca4314
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 18 08:49:28 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 18 08:49:28 2016 -0400

    Merge topic 'msvc-suppress-rc-logo' into next
    
    cca43140 Revert "MSVC: Suppress rc.exe logo/banner when CMAKE_VERBOSE_MAKEFILE is false"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cca431403460e5d23b38ad528812dadd03e8c82c
commit cca431403460e5d23b38ad528812dadd03e8c82c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 18 08:49:03 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 18 08:49:03 2016 -0400

    Revert "MSVC: Suppress rc.exe logo/banner when CMAKE_VERBOSE_MAKEFILE is false"
    
    This reverts commit 08f570b7fb76c1895663ae8665d2494c988069b4.

diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake
index 8e320da..60276e2 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> ${CMAKE_CL_NOLOGO} <DEFINES> <INCLUDES> <FLAGS> /fo<OBJECT> <SOURCE>")
+    "<CMAKE_RC_COMPILER> <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