summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-10-10 11:20:09 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-10-14 22:41:21 (GMT)
commita48bcabd33c3d7dcab394e267d4f1b5d21e0d85d (patch)
tree50a1de34ea3aba988aee283e892841b444b307e6
parent6694d99376c8fa7ff327a6b07787cef1bea9b93b (diff)
downloadCMake-a48bcabd33c3d7dcab394e267d4f1b5d21e0d85d.zip
CMake-a48bcabd33c3d7dcab394e267d4f1b5d21e0d85d.tar.gz
CMake-a48bcabd33c3d7dcab394e267d4f1b5d21e0d85d.tar.bz2
cmTarget: Move backtrace member out of internal class.
-rw-r--r--Source/cmTarget.cxx7
-rw-r--r--Source/cmTarget.h2
2 files changed, 4 insertions, 5 deletions
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