[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1141-g9783c9d
Stephen Kelly
steveire at gmail.com
Tue Oct 27 16:55:01 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 9783c9d76f4feaa77b4952b99179702195c57484 (commit)
via 13a37f5f76eb03e01e9ca225281531233ff0006c (commit)
via 958508bb1fa8854cfe7bc4386fe83c82fed73e65 (commit)
via 91a829c165209b96c20d17f8eb7d46d3375cc57c (commit)
via e0213882222798eec587a4dbed6f28555d64b8d9 (commit)
via 0554c2c970bf12dba01b408f3d8a103ede10a30b (commit)
via b22e5d0ab71199b45f1f9f4e271f677dba602452 (commit)
from b0338173a7374c328c7b10691da55d4ffa57fda5 (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=9783c9d76f4feaa77b4952b99179702195c57484
commit 9783c9d76f4feaa77b4952b99179702195c57484
Merge: b033817 13a37f5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 16:54:59 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 27 16:54:59 2015 -0400
Merge topic 'minor-cleanups' into next
13a37f5f cmMakefile: Fix typo in comment
958508bb cmMakefile: Fix style
91a829c1 Makefiles: Remove unused variable
e0213882 cmTarget: Remove obsolete member
0554c2c9 cmTarget: Fix style
b22e5d0a Remove some obsolete declarations
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13a37f5f76eb03e01e9ca225281531233ff0006c
commit 13a37f5f76eb03e01e9ca225281531233ff0006c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:03:55 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:54:12 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=958508bb1fa8854cfe7bc4386fe83c82fed73e65
commit 958508bb1fa8854cfe7bc4386fe83c82fed73e65
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:04:07 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:54:11 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=91a829c165209b96c20d17f8eb7d46d3375cc57c
commit 91a829c165209b96c20d17f8eb7d46d3375cc57c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 01:12:38 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:54:11 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=e0213882222798eec587a4dbed6f28555d64b8d9
commit e0213882222798eec587a4dbed6f28555d64b8d9
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:09:41 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:54:11 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=0554c2c970bf12dba01b408f3d8a103ede10a30b
commit 0554c2c970bf12dba01b408f3d8a103ede10a30b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 00:56:31 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:54:11 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=b22e5d0ab71199b45f1f9f4e271f677dba602452
commit b22e5d0ab71199b45f1f9f4e271f677dba602452
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 18:27:44 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:52:47 2015 +0100
Remove some obsolete declarations
Ensure that cmStandardIncludes.h is included before any platform header
in cmGeneratorExpressionEvaluator.h. That file needs to change as
a result of removal of the cmMakefile.h header from
cmGeneratorExpressionNode.h, affecting the compilation of
cmGeneratorExpressionNode.cxx.
On AIX we need to include our own headers first to get large file
support macros defined consistently within system headers. The old
order in this header worked only because it was always included after
other headers.
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..407f83f 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -12,13 +12,11 @@
#ifndef cmGeneratorExpressionEvaluator_h
#define cmGeneratorExpressionEvaluator_h
-#include <vector>
-#include <string>
-
#include "cmListFileCache.h"
#include "cmGeneratorExpressionContext.h"
-class cmTarget;
+#include <vector>
+#include <string>
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"
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list