[Cmake-commits] CMake branch, master, updated. v3.3.0-768-g3d0a719

[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, master has been updated
       via  3d0a719b703a2d4dd9b38b54847453a3f5a2d7f7 (commit)
       via  afeb4eb243e01df5c7396dc346f2629b21115e2c (commit)
      from  e8592e555fb3f19dd8a5b88948603c72b2a17a8d (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=3d0a719b703a2d4dd9b38b54847453a3f5a2d7f7
commit 3d0a719b703a2d4dd9b38b54847453a3f5a2d7f7
Merge: e8592e5 afeb4eb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 10 09:13:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 10 09:13:18 2015 -0400

    Merge topic 'change-nmake-env-warning'
    
    afeb4eb2 nmake/jom: Only warn about bad VS environment if compiler not found.


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

Summary of changes:
 Source/cmGlobalGenerator.h                         |    4 +--
 Source/cmGlobalJOMMakefileGenerator.cxx            |   28 +++++++++++---------
 Source/cmGlobalJOMMakefileGenerator.h              |    3 +++
 Source/cmGlobalNMakeMakefileGenerator.cxx          |   28 +++++++++++---------
 Source/cmGlobalNMakeMakefileGenerator.h            |    3 +++
 ...lerC-stderr.txt => BadCompilerC-stderr-JOM.txt} |    5 ++++
 ...rC-stderr.txt => BadCompilerC-stderr-NMake.txt} |    5 ++++
 ...XX-stderr.txt => BadCompilerCXX-stderr-JOM.txt} |    5 ++++
 ...-stderr.txt => BadCompilerCXX-stderr-NMake.txt} |    5 ++++
 ...tderr.txt => BadCompilerCandCXX-stderr-JOM.txt} |   10 +++++++
 ...err.txt => BadCompilerCandCXX-stderr-NMake.txt} |   10 +++++++
 Tests/RunCMake/CompilerNotFound/RunCMakeTest.cmake |   14 ++++++++++
 12 files changed, 94 insertions(+), 26 deletions(-)
 copy Tests/RunCMake/CompilerNotFound/{BadCompilerC-stderr.txt => BadCompilerC-stderr-JOM.txt} (61%)
 copy Tests/RunCMake/CompilerNotFound/{BadCompilerC-stderr.txt => BadCompilerC-stderr-NMake.txt} (60%)
 copy Tests/RunCMake/CompilerNotFound/{BadCompilerCXX-stderr.txt => BadCompilerCXX-stderr-JOM.txt} (61%)
 copy Tests/RunCMake/CompilerNotFound/{BadCompilerCXX-stderr.txt => BadCompilerCXX-stderr-NMake.txt} (61%)
 copy Tests/RunCMake/CompilerNotFound/{BadCompilerCandCXX-stderr.txt => BadCompilerCandCXX-stderr-JOM.txt} (61%)
 copy Tests/RunCMake/CompilerNotFound/{BadCompilerCandCXX-stderr.txt => BadCompilerCandCXX-stderr-NMake.txt} (60%)


hooks/post-receive
-- 
CMake