[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-353-gc5eda76
Stephen Kelly
steveire at gmail.com
Sat Oct 10 07:26:21 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 c5eda76a39c98711216a68805a2c716b542419b3 (commit)
via 3fa1996761c86079d71581caead4ec69ab808739 (commit)
via 9af81007b00417fe814602c1f3ab008191038929 (commit)
via 2cf7dc74f549d7cd08e502aa3c5912410be96b98 (commit)
from a3bf276785818646050d9e396072cd129bff668c (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=c5eda76a39c98711216a68805a2c716b542419b3
commit c5eda76a39c98711216a68805a2c716b542419b3
Merge: a3bf276 3fa1996
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 07:26:17 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 07:26:17 2015 -0400
Merge topic 'use-generator-target' into next
3fa19967 cmTarget: Move ImportInfoMap out of internal class.
9af81007 cmTarget: Move backtrace member out of internal class.
2cf7dc74 cmTarget: Remove unneeded constructors.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fa1996761c86079d71581caead4ec69ab808739
commit 3fa1996761c86079d71581caead4ec69ab808739
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:15:40 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 13:21:54 2015 +0200
cmTarget: Move ImportInfoMap out of internal class.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 369e497..847a5c1 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
class cmTargetInternals
{
public:
- typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
- ImportInfoMapType ImportInfoMap;
-
std::vector<std::string> IncludeDirectoriesEntries;
std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
std::vector<std::string> CompileOptionsEntries;
@@ -1538,7 +1535,7 @@ void cmTarget::MaybeInvalidatePropertyCache(const std::string& prop)
// Wipe out maps caching information affected by this property.
if(this->IsImported() && cmHasLiteralPrefix(prop, "IMPORTED"))
{
- this->Internal->ImportInfoMap.clear();
+ this->ImportInfoMap.clear();
}
}
@@ -2288,16 +2285,15 @@ cmTarget::GetImportInfo(const std::string& config) const
{
config_upper = "NOCONFIG";
}
- typedef cmTargetInternals::ImportInfoMapType ImportInfoMapType;
ImportInfoMapType::const_iterator i =
- this->Internal->ImportInfoMap.find(config_upper);
- if(i == this->Internal->ImportInfoMap.end())
+ this->ImportInfoMap.find(config_upper);
+ if(i == this->ImportInfoMap.end())
{
ImportInfo info;
this->ComputeImportInfo(config_upper, info);
ImportInfoMapType::value_type entry(config_upper, info);
- i = this->Internal->ImportInfoMap.insert(entry).first;
+ i = this->ImportInfoMap.insert(entry).first;
}
if(this->GetType() == INTERFACE_LIBRARY)
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 03c4cbe..97515a7 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -449,6 +449,9 @@ private:
std::string SharedDeps;
};
+ typedef std::map<std::string, ImportInfo> ImportInfoMapType;
+ mutable ImportInfoMapType ImportInfoMap;
+
ImportInfo const* GetImportInfo(const std::string& config) const;
void ComputeImportInfo(std::string const& desired_config,
ImportInfo& info) const;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9af81007b00417fe814602c1f3ab008191038929
commit 9af81007b00417fe814602c1f3ab008191038929
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 13:20:09 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 13:20:09 2015 +0200
cmTarget: Move backtrace member out of internal class.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index fd8ea3e..369e497 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
class cmTargetInternals
{
public:
- // The backtrace when the target was created.
- cmListFileBacktrace Backtrace;
-
typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
ImportInfoMapType ImportInfoMap;
@@ -240,7 +237,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
}
// Save the backtrace of target construction.
- this->Internal->Backtrace = this->Makefile->GetBacktrace();
+ this->Backtrace = this->Makefile->GetBacktrace();
if (!this->IsImported())
{
@@ -363,7 +360,7 @@ void cmTarget::FinishConfigure()
//----------------------------------------------------------------------------
cmListFileBacktrace const& cmTarget::GetBacktrace() const
{
- return this->Internal->Backtrace;
+ return this->Backtrace;
}
//----------------------------------------------------------------------------
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 01261ed..03c4cbe 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -471,6 +471,8 @@ private:
std::string const& suffix,
std::string const& name,
const char* version) const;
+
+ cmListFileBacktrace Backtrace;
};
#ifdef CMAKE_BUILD_WITH_CMAKE
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cf7dc74f549d7cd08e502aa3c5912410be96b98
commit 2cf7dc74f549d7cd08e502aa3c5912410be96b98
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:11:48 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 13:17:56 2015 +0200
cmTarget: Remove unneeded constructors.
The compiler generated ones are fine here.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b8beb5c..fd8ea3e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,16 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
class cmTargetInternals
{
public:
- cmTargetInternals()
- : Backtrace()
- {
- }
- cmTargetInternals(cmTargetInternals const&)
- : Backtrace()
- {
- }
- ~cmTargetInternals();
-
// The backtrace when the target was created.
cmListFileBacktrace Backtrace;
@@ -95,11 +85,6 @@ public:
};
//----------------------------------------------------------------------------
-cmTargetInternals::~cmTargetInternals()
-{
-}
-
-//----------------------------------------------------------------------------
cmTarget::cmTarget()
{
this->Makefile = 0;
-----------------------------------------------------------------------
Summary of changes:
Source/cmTarget.cxx | 34 ++++++----------------------------
Source/cmTarget.h | 5 +++++
2 files changed, 11 insertions(+), 28 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list