[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1091-gf94ceec
Stephen Kelly
steveire at gmail.com
Mon Oct 26 18:50:26 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, next has been updated
via f94ceec95d7444fc6d4f151f8d8a07643ec27db6 (commit)
via 1385ec49f071e81838bcb5bf8973c6fcbba9e280 (commit)
via 0e0a60ac4ea0687ddd991b80762f591b79f2b528 (commit)
via 58f96e3e5ed6d62f7aa381283fbad16a5a8b4847 (commit)
via a7dec996fb26a27411cafe2872ad255e741f3fb4 (commit)
via b5f23d67b5d6be6c7e4d970d23ca4eb86a6857a0 (commit)
via c941d7e324b88ec7cda88dbe99e64b1b37f42cff (commit)
via ce43ed2cc14f96c56441da9908053737efbaaf2e (commit)
from 5faad89d23c55235bfa4510c7378bae5620053ae (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=f94ceec95d7444fc6d4f151f8d8a07643ec27db6
commit f94ceec95d7444fc6d4f151f8d8a07643ec27db6
Merge: 5faad89 1385ec4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 18:50:25 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 18:50:25 2015 -0400
Merge topic 'minor-cleanups' into next
1385ec49 cmMakefile: Fix typo in comment
0e0a60ac cmMakefile: Fix style
58f96e3e Makefiles: Remove unused variable
a7dec996 cmTarget: Remove obsolete member
b5f23d67 cmTarget: Fix style
c941d7e3 Remove some obsolete declarations
ce43ed2c Use LocalGenerator when possible
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1385ec49f071e81838bcb5bf8973c6fcbba9e280
commit 1385ec49f071e81838bcb5bf8973c6fcbba9e280
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:03:55 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:06 2015 +0100
cmMakefile: Fix typo in comment
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0982da1..84ec4fb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2174,7 +2174,7 @@ cmMakefile::GetSourceGroup(const std::vector<std::string>&name) const
{
cmSourceGroup* sg = 0;
- // first look for source group starting with the same as the one we wants
+ // first look for source group starting with the same as the one we want
for (std::vector<cmSourceGroup>::const_iterator
sgIt = this->SourceGroups.begin();
sgIt != this->SourceGroups.end(); ++sgIt)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e0a60ac4ea0687ddd991b80762f591b79f2b528
commit 0e0a60ac4ea0687ddd991b80762f591b79f2b528
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:04:07 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:06 2015 +0100
cmMakefile: Fix style
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 40e2892..0982da1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2207,7 +2207,7 @@ void cmMakefile::AddSourceGroup(const std::string& name,
{
std::vector<std::string> nameVector;
nameVector.push_back(name);
- AddSourceGroup(nameVector, regex);
+ this->AddSourceGroup(nameVector, regex);
}
void cmMakefile::AddSourceGroup(const std::vector<std::string>& name,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58f96e3e5ed6d62f7aa381283fbad16a5a8b4847
commit 58f96e3e5ed6d62f7aa381283fbad16a5a8b4847
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 01:12:38 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:06 2015 +0100
Makefiles: Remove unused variable
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 27d631e..3972b41 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -173,7 +173,6 @@ void cmLocalUnixMakefileGenerator3::ComputeObjectFilenames(
void cmLocalUnixMakefileGenerator3::
GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
{
- std::set<std::string> emitted;
std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
ti != targets.end(); ++ti)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7dec996fb26a27411cafe2872ad255e741f3fb4
commit a7dec996fb26a27411cafe2872ad255e741f3fb4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:09:41 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:06 2015 +0100
cmTarget: Remove obsolete member
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a016e92..da49048 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -61,7 +61,6 @@ cmTarget::cmTarget()
this->HaveInstallRule = false;
this->DLLPlatform = false;
this->IsAndroid = false;
- this->IsApple = false;
this->IsImportedTarget = false;
this->BuildInterfaceIncludesAppended = false;
}
@@ -98,9 +97,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
strcmp(this->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME"),
"Android") == 0;
- // Check whether we are targeting an Apple platform.
- this->IsApple = this->Makefile->IsOn("APPLE");
-
// Setup default property values.
if (this->GetType() != cmState::INTERFACE_LIBRARY
&& this->GetType() != cmState::UTILITY)
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 52ed578..f3a45d3 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -357,7 +357,6 @@ private:
bool RecordDependencies;
bool DLLPlatform;
bool IsAndroid;
- bool IsApple;
bool IsImportedTarget;
bool BuildInterfaceIncludesAppended;
#if defined(_WIN32) && !defined(__CYGWIN__)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5f23d67b5d6be6c7e4d970d23ca4eb86a6857a0
commit b5f23d67b5d6be6c7e4d970d23ca4eb86a6857a0
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 00:56:31 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:05 2015 +0100
cmTarget: Fix style
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e056469..a016e92 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -299,7 +299,8 @@ void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
{
if(this->Utilities.insert(u).second && makefile)
{
- UtilityBacktraces.insert(std::make_pair(u, makefile->GetBacktrace()));
+ this->UtilityBacktraces.insert(
+ std::make_pair(u, makefile->GetBacktrace()));
}
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c941d7e324b88ec7cda88dbe99e64b1b37f42cff
commit c941d7e324b88ec7cda88dbe99e64b1b37f42cff
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 18:27:44 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:05 2015 +0100
Remove some obsolete declarations
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 889fb08..f10e4e4 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -13,7 +13,6 @@
#define cmComputeLinkDepends_h
#include "cmStandardIncludes.h"
-#include "cmTarget.h"
#include "cmLinkItem.h"
#include "cmGraphAdjacencyList.h"
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 1741acf..ff5d3ab 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -17,7 +17,6 @@
#include "cmake.h"
#include "cmSourceFile.h"
#include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
#include "cmSystemTools.h"
#include <cmsys/SystemTools.hxx>
diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h
index b20d0a7..281c1ef 100644
--- a/Source/cmExtraKateGenerator.h
+++ b/Source/cmExtraKateGenerator.h
@@ -16,8 +16,6 @@
#include "cmExternalMakefileProjectGenerator.h"
class cmLocalGenerator;
-class cmMakefile;
-class cmTarget;
class cmGeneratedFileStream;
/** \class cmExtraKateGenerator
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index 5eed89d..c3b0272 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -12,7 +12,6 @@
#include "cmGeneratorExpressionDAGChecker.h"
-#include "cmMakefile.h"
#include "cmLocalGenerator.h"
#include "cmAlgorithms.h"
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index 7c1bd8c..db56eb1 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -18,8 +18,6 @@
#include "cmListFileCache.h"
#include "cmGeneratorExpressionContext.h"
-class cmTarget;
-
struct cmGeneratorExpressionDAGChecker;
struct cmGeneratorExpressionNode;
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7a7e4ff..af72123 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -14,6 +14,7 @@
#include "cmGlobalGenerator.h"
#include "cmAlgorithms.h"
#include "cmOutputConverter.h"
+#include "cmMakefile.h"
//----------------------------------------------------------------------------
std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index db65db1..854811b 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -12,8 +12,6 @@
#ifndef cmGeneratorExpressionNode_h
#define cmGeneratorExpressionNode_h
-#include "cmMakefile.h"
-
#include "cmGeneratorExpressionEvaluator.h"
#include "cmGeneratorExpressionParser.h"
#include "cmGeneratorExpressionDAGChecker.h"
diff --git a/Source/cmGeneratorExpressionParser.h b/Source/cmGeneratorExpressionParser.h
index 28f1441..5bd6777 100644
--- a/Source/cmGeneratorExpressionParser.h
+++ b/Source/cmGeneratorExpressionParser.h
@@ -19,8 +19,6 @@
#include "cmListFileCache.h"
-class cmMakefile;
-class cmTarget;
struct cmGeneratorExpressionEvaluator;
//----------------------------------------------------------------------------
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index c4e28ca..2fa0598 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -15,7 +15,6 @@
#include "cmMakefile.h"
#include "cmake.h"
#include "cmGeneratedFileStream.h"
-#include "cmSourceFile.h"
#include "cmGeneratorTarget.h"
#include "cmAlgorithms.h"
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index edd6a0e..ea27f61 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -11,7 +11,6 @@
============================================================================*/
#include "cmInstallDirectoryGenerator.h"
-#include "cmTarget.h"
#include "cmGeneratorExpression.h"
#include "cmLocalGenerator.h"
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index d59fdc6..d0784ad 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -10,7 +10,6 @@
See the License for more information.
============================================================================*/
#include "cmLocalVisualStudio10Generator.h"
-#include "cmTarget.h"
#include "cmMakefile.h"
#include "cmVisualStudio10TargetGenerator.h"
#include "cmGlobalVisualStudio10Generator.h"
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 1cae94f..52ed578 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -30,7 +30,6 @@ class cmake;
class cmMakefile;
class cmSourceFile;
class cmGlobalGenerator;
-class cmComputeLinkInformation;
class cmListFileBacktrace;
class cmTarget;
class cmGeneratorTarget;
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index d997596..b411f15 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -13,10 +13,8 @@
#include "cmGeneratorExpression.h"
#include "cmOutputConverter.h"
-#include "cmMakefile.h"
#include "cmLocalGenerator.h"
#include "cmSystemTools.h"
-#include "cmTarget.h"
#include "cmTest.h"
//----------------------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce43ed2cc14f96c56441da9908053737efbaaf2e
commit ce43ed2cc14f96c56441da9908053737efbaaf2e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 00:29:36 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:05 2015 +0100
Use LocalGenerator when possible
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index b819dad..0488391 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -147,7 +147,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
void cmGlobalVisualStudioGenerator
::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const
{
- std::string dir = gt->Makefile->GetCurrentBinaryDirectory();
+ std::string dir = gt->LocalGenerator->GetCurrentBinaryDirectory();
dir += "/";
std::string tgtDir = gt->LocalGenerator->GetTargetDirectory(gt);
if(!tgtDir.empty())
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 891c44e..e11571a 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -42,7 +42,7 @@ void cmLocalNinjaGenerator::Generate()
// Compute the path to use when referencing the current output
// directory from the top output directory.
this->HomeRelativeOutputPath =
- this->Convert(this->Makefile->GetCurrentBinaryDirectory(), HOME_OUTPUT);
+ this->Convert(this->GetCurrentBinaryDirectory(), HOME_OUTPUT);
if(this->HomeRelativeOutputPath == ".")
{
this->HomeRelativeOutputPath = "";
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 34a50a3..27d631e 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -144,7 +144,7 @@ void cmLocalUnixMakefileGenerator3::ComputeHomeRelativeOutputPath()
// Compute the path to use when referencing the current output
// directory from the top output directory.
this->HomeRelativeOutputPath =
- this->Convert(this->Makefile->GetCurrentBinaryDirectory(), HOME_OUTPUT);
+ this->Convert(this->GetCurrentBinaryDirectory(), HOME_OUTPUT);
if(this->HomeRelativeOutputPath == ".")
{
this->HomeRelativeOutputPath = "";
@@ -503,7 +503,7 @@ void cmLocalUnixMakefileGenerator3
//----------------------------------------------------------------------------
void cmLocalUnixMakefileGenerator3::WriteDirectoryInformationFile()
{
- std::string infoFileName = this->Makefile->GetCurrentBinaryDirectory();
+ std::string infoFileName = this->GetCurrentBinaryDirectory();
infoFileName += cmake::GetCMakeFilesDirectory();
infoFileName += "/CMakeDirectoryInformation.cmake";
@@ -567,7 +567,7 @@ std::string
cmLocalUnixMakefileGenerator3
::ConvertToFullPath(const std::string& localPath)
{
- std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+ std::string dir = this->GetCurrentBinaryDirectory();
dir += "/";
dir += localPath;
return dir;
@@ -1064,7 +1064,7 @@ cmLocalUnixMakefileGenerator3
}
// if the command specified a working directory use it.
- std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+ std::string dir = this->GetCurrentBinaryDirectory();
std::string workingDir = ccg.GetWorkingDirectory();
if(!workingDir.empty())
{
@@ -1214,7 +1214,7 @@ cmLocalUnixMakefileGenerator3
const std::vector<std::string>& files,
cmGeneratorTarget* target, const char* filename)
{
- std::string cleanfile = this->Makefile->GetCurrentBinaryDirectory();
+ std::string cleanfile = this->GetCurrentBinaryDirectory();
cleanfile += "/";
cleanfile += this->GetTargetDirectory(target);
cleanfile += "/cmake_clean";
@@ -1493,7 +1493,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
// If the directory information is newer than depend.internal, include dirs
// may have changed. In this case discard all old dependencies.
bool needRescanDirInfo = false;
- std::string dirInfoFile = this->Makefile->GetCurrentBinaryDirectory();
+ std::string dirInfoFile = this->GetCurrentBinaryDirectory();
dirInfoFile += cmake::GetCMakeFilesDirectory();
dirInfoFile += "/CMakeDirectoryInformation.cmake";
{
@@ -1567,7 +1567,7 @@ cmLocalUnixMakefileGenerator3
// Read the directory information file.
cmMakefile* mf = this->Makefile;
bool haveDirectoryInfo = false;
- std::string dirInfoFile = this->Makefile->GetCurrentBinaryDirectory();
+ std::string dirInfoFile = this->GetCurrentBinaryDirectory();
dirInfoFile += cmake::GetCMakeFilesDirectory();
dirInfoFile += "/CMakeDirectoryInformation.cmake";
if(mf->ReadListFile(dirInfoFile.c_str()) &&
@@ -1828,7 +1828,7 @@ void cmLocalUnixMakefileGenerator3
std::vector<std::string> commands;
// Write the all rule.
- std::string recursiveTarget = this->Makefile->GetCurrentBinaryDirectory();
+ std::string recursiveTarget = this->GetCurrentBinaryDirectory();
recursiveTarget += "/all";
depends.push_back("cmake_check_build_system");
@@ -1872,7 +1872,7 @@ void cmLocalUnixMakefileGenerator3
depends, commands, true);
// Write the clean rule.
- recursiveTarget = this->Makefile->GetCurrentBinaryDirectory();
+ recursiveTarget = this->GetCurrentBinaryDirectory();
recursiveTarget += "/clean";
commands.clear();
depends.clear();
@@ -1890,7 +1890,7 @@ void cmLocalUnixMakefileGenerator3
depends, commands, true);
// Write the preinstall rule.
- recursiveTarget = this->Makefile->GetCurrentBinaryDirectory();
+ recursiveTarget = this->GetCurrentBinaryDirectory();
recursiveTarget += "/preinstall";
commands.clear();
depends.clear();
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list