[Cmake-commits] CMake branch, master, updated. v3.2.2-1155-g2e4ea0c
Brad King
brad.king at kitware.com
Fri May 15 11:22:37 EDT 2015
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 2e4ea0c055e01e10c8f459398f943b1b62c5c7bb (commit)
via ce167b546d078d9f699248688ff5f16c7ecf15c7 (commit)
via 7baef756493caaabc226c39c4a8dad669b883d4d (commit)
via 63255342c63fa60926c8cef5d0cdcf372f977b5f (commit)
via 894961af16c83beb785b3d0fa7d1e6b80946eaac (commit)
via 115e9199822a6c9395cc3bb55c57e061b5fc6315 (commit)
via c5059c900036fd9500d64fbd7f9d2d3631152295 (commit)
via b17686d2bbc193f19c60cdf44a228e49b4ffe386 (commit)
via ed41a8e7b4cf665ebab8e4780f8b0b299113fd11 (commit)
via 48a9e91b02090ba263cd46ef5c33ba3d2aa873ba (commit)
via e7f7c2e208a62c60e4a20ef115ba47a2ff7194a1 (commit)
via c5cb3a734dd6d2472f10379d45dcec7ce03293d9 (commit)
via 76b598319ffe507870f918cdafe7ba7d43d9e195 (commit)
via 34c9ee2ed75e12c713bb49c699ac1dd882d1b8fa (commit)
via 3837c48334ff670d9132f80e35a31e263b21d3a1 (commit)
via b317b38d3345a648c99a549e30cc50868e89c516 (commit)
via 9486769866661e3aa76dd588ca5a7466e2969dc3 (commit)
via a3139d4b1512195485cde49d919a13cdaec62660 (commit)
via 443f041c2fa0355b9b622337da0612ce48cf29b6 (commit)
from 912dff6253891dacb6a0196456adab26516a0949 (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=2e4ea0c055e01e10c8f459398f943b1b62c5c7bb
commit 2e4ea0c055e01e10c8f459398f943b1b62c5c7bb
Merge: 912dff6 ce167b5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 15 11:22:36 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 15 11:22:36 2015 -0400
Merge topic 'refactor-cmLocalGenerator'
ce167b54 cmMakefile: Handle CMP0014 before configuring the generator.
7baef756 cmLocalGenerator: Assert that there is a parent.
63255342 cmMakefile: Remove redundant variable set.
894961af cmMakefile: Use the state to determine the parent directory.
115e9199 Use new top-level check abstraction.
c5059c90 cmLocalGenerator: Add abstraction to check if top-level.
b17686d2 cmGlobalGenerator: Move some flags from cmLocalGenerator.
ed41a8e7 cmLocalGenerator: Port loops to cmState::Snapshot.
48a9e91b cmState: Add an accessor for Parent snapshot and a validity check.
e7f7c2e2 cmLocalGenerator: Convert two recursive methods to loops.
c5cb3a73 cmLocalGenerator: Get project directories from the cmState.
76b59831 cmLocalGenerator: Initialize state before creating cmMakefile.
34c9ee2e cmLocalGenerator: Require a global generator in the constructor.
3837c483 Tests: Add case for 'ctest' run with bad CTestTestfile
b317b38d cmGlobalBorlandMakefileGenerator: Do not inherit from NMake generator
94867698 Don't use a cmLocalGenerator instance to call static methods.
...
-----------------------------------------------------------------------
Summary of changes:
Source/cmCoreTryCompile.cxx | 8 +-
Source/cmCustomCommandGenerator.cxx | 31 ++-
Source/cmGlobalBorlandMakefileGenerator.cxx | 5 +-
Source/cmGlobalBorlandMakefileGenerator.h | 2 +-
Source/cmGlobalGenerator.cxx | 11 +-
Source/cmGlobalGenerator.h | 7 +
Source/cmGlobalGhsMultiGenerator.cxx | 3 +-
Source/cmGlobalJOMMakefileGenerator.cxx | 7 +-
Source/cmGlobalMSYSMakefileGenerator.cxx | 6 +-
Source/cmGlobalMinGWMakefileGenerator.cxx | 7 +-
Source/cmGlobalNMakeMakefileGenerator.cxx | 7 +-
Source/cmGlobalNinjaGenerator.cxx | 7 +-
Source/cmGlobalUnixMakefileGenerator3.cxx | 8 +-
Source/cmGlobalVisualStudio10Generator.cxx | 7 +-
Source/cmGlobalVisualStudio11Generator.cxx | 7 +-
Source/cmGlobalVisualStudio12Generator.cxx | 7 +-
Source/cmGlobalVisualStudio14Generator.cxx | 7 +-
Source/cmGlobalVisualStudio6Generator.cxx | 4 +-
Source/cmGlobalVisualStudio71Generator.cxx | 3 +-
Source/cmGlobalVisualStudio7Generator.cxx | 3 +-
Source/cmGlobalVisualStudio8Generator.cxx | 3 +-
Source/cmGlobalVisualStudio9Generator.cxx | 3 +-
Source/cmGlobalVisualStudioGenerator.cxx | 2 +
Source/cmGlobalWatcomWMakeGenerator.cxx | 11 +-
Source/cmGlobalXCodeGenerator.cxx | 4 +-
Source/cmIfCommand.cxx | 9 +-
Source/cmLocalGenerator.cxx | 289 ++++++++++----------
Source/cmLocalGenerator.h | 33 +--
Source/cmLocalGhsMultiGenerator.cxx | 5 +-
Source/cmLocalGhsMultiGenerator.h | 2 +-
Source/cmLocalNinjaGenerator.cxx | 17 +-
Source/cmLocalNinjaGenerator.h | 5 +-
Source/cmLocalUnixMakefileGenerator3.cxx | 33 +--
Source/cmLocalUnixMakefileGenerator3.h | 33 +--
Source/cmLocalVisualStudio10Generator.cxx | 5 +-
Source/cmLocalVisualStudio10Generator.h | 3 +-
Source/cmLocalVisualStudio6Generator.cxx | 5 +-
Source/cmLocalVisualStudio6Generator.h | 3 +-
Source/cmLocalVisualStudio7Generator.cxx | 5 +-
Source/cmLocalVisualStudio7Generator.h | 3 +-
Source/cmLocalVisualStudioGenerator.cxx | 7 +-
Source/cmLocalVisualStudioGenerator.h | 3 +-
Source/cmLocalXCodeGenerator.cxx | 5 +-
Source/cmLocalXCodeGenerator.h | 2 +-
Source/cmMakefile.cxx | 61 +++--
Source/cmMakefileTargetGenerator.cxx | 4 +-
Source/cmProjectCommand.cxx | 2 +-
Source/cmState.cxx | 21 ++
Source/cmState.h | 3 +
Source/cmTestGenerator.cxx | 16 +-
.../CTestCommandLine/BadCTestTestfile-stderr.txt | 4 +
Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 13 +
52 files changed, 401 insertions(+), 360 deletions(-)
create mode 100644 Tests/RunCMake/CTestCommandLine/BadCTestTestfile-stderr.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list