[Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-817-gcf240df

[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  cf240dfa5d985e5ac8f7e11abf1bc2646b8b0a9e (commit)
       via  3e98ebbaef9cfa1544f960320ebc4258e82909bd (commit)
      from  b80f57d14676b2f639554496c0b9d19c67e0aa2b (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf240dfa5d985e5ac8f7e11abf1bc2646b8b0a9e
commit cf240dfa5d985e5ac8f7e11abf1bc2646b8b0a9e
Merge: b80f57d 3e98ebb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 2 10:11:39 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 2 10:11:39 2015 -0500

    Merge topic 'fix-JOM-quiet-make' into next
    
    3e98ebba JOM: Pass /NOLOGO when driving builds as is done for NMake


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e98ebbaef9cfa1544f960320ebc4258e82909bd
commit 3e98ebbaef9cfa1544f960320ebc4258e82909bd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 2 10:08:09 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 2 10:08:09 2015 -0500

    JOM: Pass /NOLOGO when driving builds as is done for NMake
    
    This fixes RunCMake.(Configure|configure_file|try_compile) test
    failures that failed to match empty stderr due to jom printing
    its identification line.

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 1d2dd34..5701564 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -563,7 +563,7 @@ void cmGlobalUnixMakefileGenerator3
 
   // Since we have full control over the invocation of nmake, let us
   // make it quiet.
-  if ( this->GetName() == "NMake Makefiles" )
+  if (cmHasLiteralPrefix(this->GetName(), "NMake Makefiles"))
     {
     makeCommand.push_back("/NOLOGO");
     }

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

Summary of changes:
 Source/cmGlobalUnixMakefileGenerator3.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake