[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-239-gf135213
Brad King
brad.king at kitware.com
Fri Oct 16 09:35:36 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 f13521317a43af4ebb2996c9916d1d1da695c5fc (commit)
via 55474e6182b49acc4183fffdebccc7ae2a7335fa (commit)
via 38df5c36d66313a5dd7859c1c55a41f60f141b13 (commit)
via 4ee2b2670854b071c8b8ceafb2a4a00f72069ef9 (commit)
via eac15298a80b814e9d5fd0077a8c5bbcbd05a8c6 (commit)
via 482b3811e4e6043c71632b560f2e773289eeb320 (commit)
via 2ee1cb85e855ce0596e85ef1fc53c5c25cc1465f (commit)
via a48bcabd33c3d7dcab394e267d4f1b5d21e0d85d (commit)
via 6694d99376c8fa7ff327a6b07787cef1bea9b93b (commit)
via 983c00f8f97260e7650fcc440047b33898f0363c (commit)
from a4f0b01939ca7c69c1e31f017c6e87b642388252 (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=f13521317a43af4ebb2996c9916d1d1da695c5fc
commit f13521317a43af4ebb2996c9916d1d1da695c5fc
Merge: a4f0b01 55474e6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 16 09:35:34 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 16 09:35:34 2015 -0400
Merge topic 'clean-up-cmTarget'
55474e61 cmState: Move GetTargetTypeName from cmTarget.
38df5c36 Remove now-obsolete casts.
4ee2b267 cmGeneratorTarget: Use enum for GetType.
eac15298 cmState: Move TargetType enum from cmTarget.
482b3811 cmTarget: Move link type enum out.
2ee1cb85 cmTarget: Move ImportInfoMap out of internal class.
a48bcabd cmTarget: Move backtrace member out of internal class.
6694d993 cmTarget: Remove unneeded constructors.
983c00f8 Generators: Use GetType from the cmGeneratorTarget.
diff --cc Source/cmExtraCodeBlocksGenerator.cxx
index cdb4d8b,5775602..3bc76fa
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@@ -352,15 -352,13 +352,15 @@@ void cmExtraCodeBlocksGenerato
this->AppendTarget(fout, ti->first, 0,
make.c_str(), *lg, compiler.c_str());
break;
- case cmTarget::EXECUTABLE:
- case cmTarget::STATIC_LIBRARY:
- case cmTarget::SHARED_LIBRARY:
- case cmTarget::MODULE_LIBRARY:
- case cmTarget::OBJECT_LIBRARY:
+ case cmState::EXECUTABLE:
+ case cmState::STATIC_LIBRARY:
+ case cmState::SHARED_LIBRARY:
+ case cmState::MODULE_LIBRARY:
+ case cmState::OBJECT_LIBRARY:
{
- this->AppendTarget(fout, ti->first, &ti->second,
+ cmGeneratorTarget* gt =
+ this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+ this->AppendTarget(fout, ti->first, gt,
make.c_str(), *lg, compiler.c_str());
std::string fastTarget = ti->first;
fastTarget += "/fast";
@@@ -561,9 -559,9 +561,9 @@@ void cmExtraCodeBlocksGenerator::Append
fout<<" <Target title=\"" << targetName << "\">\n";
if (target!=0)
{
- int cbTargetType = this->GetCBTargetType(target);
+ int cbTargetType = this->GetCBTargetType(target->Target);
std::string workingDir = lg->GetCurrentBinaryDirectory();
- if ( target->GetType()==cmTarget::EXECUTABLE)
+ if ( target->GetType()==cmState::EXECUTABLE)
{
// Determine the directory where the executable target is created, and
// set the working directory to this dir.
diff --cc Source/cmGlobalUnixMakefileGenerator3.cxx
index a0ad72d,4674fcd..ee31e28
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@@ -426,15 -428,14 +426,15 @@@ void cmGlobalUnixMakefileGenerator
for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin();
l != lg->GetMakefile()->GetTargets().end(); l++)
{
- if((l->second.GetType() == cmTarget::EXECUTABLE) ||
- (l->second.GetType() == cmTarget::STATIC_LIBRARY) ||
- (l->second.GetType() == cmTarget::SHARED_LIBRARY) ||
- (l->second.GetType() == cmTarget::MODULE_LIBRARY) ||
- (l->second.GetType() == cmTarget::OBJECT_LIBRARY) ||
- (l->second.GetType() == cmTarget::UTILITY))
+ if((l->second.GetType() == cmState::EXECUTABLE) ||
+ (l->second.GetType() == cmState::STATIC_LIBRARY) ||
+ (l->second.GetType() == cmState::SHARED_LIBRARY) ||
+ (l->second.GetType() == cmState::MODULE_LIBRARY) ||
+ (l->second.GetType() == cmState::OBJECT_LIBRARY) ||
+ (l->second.GetType() == cmState::UTILITY))
{
- std::string tname = lg->GetRelativeTargetDirectory(l->second);
+ cmGeneratorTarget* gt = this->GetGeneratorTarget(&l->second);
+ std::string tname = lg->GetRelativeTargetDirectory(gt);
tname += "/DependInfo.cmake";
cmSystemTools::ConvertToUnixSlashes(tname);
cmakefileStream << " \"" << tname << "\"\n";
diff --cc Source/cmLocalVisualStudio7Generator.cxx
index 65f42c2,e891c33..1122919
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@@ -1109,11 -1109,11 +1109,11 @@@ void cmLocalVisualStudio7Generator::Out
}
switch(target.GetType())
{
- case cmTarget::UNKNOWN_LIBRARY:
+ case cmState::UNKNOWN_LIBRARY:
break;
- case cmTarget::OBJECT_LIBRARY:
+ case cmState::OBJECT_LIBRARY:
{
- std::string libpath = this->GetTargetDirectory(target);
+ std::string libpath = this->GetTargetDirectory(gt);
libpath += "/";
libpath += configName;
libpath += "/";
diff --cc Source/cmMakefileLibraryTargetGenerator.cxx
index 1278dcd,0b38656..a0aa10b
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@@ -441,10 -441,10 +441,10 @@@ void cmMakefileLibraryTargetGenerator::
std::vector<std::string> commands1;
// Add a command to remove any existing files for this library.
// for static libs only
- if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+ if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
{
this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
- *this->Target, "target");
+ this->GeneratorTarget, "target");
this->LocalGenerator->CreateCDCommand
(commands1,
this->Makefile->GetCurrentBinaryDirectory(),
-----------------------------------------------------------------------
Summary of changes:
Source/cmAddExecutableCommand.cxx | 6 +-
Source/cmAddLibraryCommand.cxx | 64 +++----
Source/cmCPluginAPI.cxx | 8 +-
Source/cmCommonTargetGenerator.cxx | 2 +-
Source/cmComputeLinkDepends.cxx | 20 +--
Source/cmComputeLinkDepends.h | 2 +-
Source/cmComputeLinkInformation.cxx | 38 ++--
Source/cmComputeTargetDepends.cxx | 22 +--
Source/cmCoreTryCompile.cxx | 12 +-
Source/cmCustomCommandGenerator.cxx | 2 +-
Source/cmExportBuildFileGenerator.cxx | 8 +-
Source/cmExportCommand.cxx | 4 +-
Source/cmExportFileGenerator.cxx | 18 +-
Source/cmExportInstallFileGenerator.cxx | 6 +-
Source/cmExportLibraryDependenciesCommand.cxx | 10 +-
Source/cmExportTryCompileFileGenerator.cxx | 2 +-
Source/cmExtraCodeBlocksGenerator.cxx | 40 ++---
Source/cmExtraCodeLiteGenerator.cxx | 16 +-
Source/cmExtraEclipseCDT4Generator.cxx | 28 +--
Source/cmExtraKateGenerator.cxx | 14 +-
Source/cmExtraSublimeTextGenerator.cxx | 14 +-
Source/cmGeneratorExpressionNode.cxx | 18 +-
Source/cmGeneratorTarget.cxx | 148 ++++++++--------
Source/cmGeneratorTarget.h | 2 +-
Source/cmGhsMultiTargetGenerator.cxx | 8 +-
Source/cmGlobalGenerator.cxx | 26 +--
Source/cmGlobalKdevelopGenerator.cxx | 2 +-
Source/cmGlobalNinjaGenerator.cxx | 18 +-
Source/cmGlobalUnixMakefileGenerator3.cxx | 70 ++++----
Source/cmGlobalVisualStudio11Generator.cxx | 6 +-
Source/cmGlobalVisualStudio11Generator.h | 2 +-
Source/cmGlobalVisualStudio6Generator.cxx | 2 +-
Source/cmGlobalVisualStudio71Generator.cxx | 2 +-
Source/cmGlobalVisualStudio71Generator.h | 2 +-
Source/cmGlobalVisualStudio7Generator.cxx | 12 +-
Source/cmGlobalVisualStudio7Generator.h | 2 +-
Source/cmGlobalVisualStudio8Generator.cxx | 12 +-
Source/cmGlobalVisualStudio8Generator.h | 4 +-
Source/cmGlobalVisualStudioGenerator.cxx | 20 +--
Source/cmGlobalXCodeGenerator.cxx | 132 +++++++-------
Source/cmGraphVizWriter.cxx | 18 +-
Source/cmGraphVizWriter.h | 2 +-
Source/cmIncludeExternalMSProjectCommand.cxx | 2 +-
Source/cmInstallCommand.cxx | 26 +--
Source/cmInstallTargetGenerator.cxx | 37 ++--
Source/cmLinkLibrariesCommand.cxx | 4 +-
Source/cmLocalGenerator.cxx | 64 +++----
Source/cmLocalGhsMultiGenerator.cxx | 2 +-
Source/cmLocalNinjaGenerator.cxx | 2 +-
Source/cmLocalUnixMakefileGenerator3.cxx | 18 +-
Source/cmLocalVisualStudio10Generator.cxx | 2 +-
Source/cmLocalVisualStudio6Generator.cxx | 110 ++++++------
Source/cmLocalVisualStudio7Generator.cxx | 76 ++++----
Source/cmLocalVisualStudioGenerator.cxx | 4 +-
Source/cmMakefile.cxx | 66 +++----
Source/cmMakefile.h | 10 +-
Source/cmMakefileLibraryTargetGenerator.cxx | 42 ++---
Source/cmMakefileTargetGenerator.cxx | 24 +--
Source/cmNinjaNormalTargetGenerator.cxx | 51 +++---
Source/cmNinjaTargetGenerator.cxx | 30 ++--
Source/cmStandardIncludes.h | 6 +
Source/cmState.cxx | 27 +++
Source/cmState.h | 8 +
Source/cmTarget.cxx | 236 ++++++++++---------------
Source/cmTarget.h | 29 ++-
Source/cmTargetLinkLibrariesCommand.cxx | 36 ++--
Source/cmTargetLinkLibrariesCommand.h | 2 +-
Source/cmTargetPropCommandBase.cxx | 14 +-
Source/cmTestGenerator.cxx | 2 +-
Source/cmVisualStudio10TargetGenerator.cxx | 106 +++++------
Source/cmake.cxx | 2 +-
71 files changed, 939 insertions(+), 943 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list