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 1b1ec57d5aef2e96192b7bc5f16d1e5a215784a1 (commit)
via 2491e369274a50ea8f27404d2a0de626c2ce93d0 (commit)
from 4e8742d78f9176a3476ec442d7353fc4b3a7a58a (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=1b1ec57d5aef2e96192b7bc5f16d1e5a215784a1
commit 1b1ec57d5aef2e96192b7bc5f16d1e5a215784a1
Merge: 4e8742d 2491e36
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 24 09:09:52 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Feb 24 09:09:52 2017 -0500
Merge topic 'cache-xaml-resx-headers' into next
2491e369 Revert "VS: Cache the list of xaml and resx headers"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2491e369274a50ea8f27404d2a0de626c2ce93d0
commit 2491e369274a50ea8f27404d2a0de626c2ce93d0
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 24 09:09:42 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Feb 24 09:09:42 2017 -0500
Revert "VS: Cache the list of xaml and resx headers"
This reverts commit fe5b8275e69a3ffe2ce22c80ba0ea08936967323.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index dfb6a5e..8512b99 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -711,17 +711,12 @@ void cmGeneratorTarget::GetExternalObjects(
IMPLEMENT_VISIT(ExternalObjects);
}
-void cmGeneratorTarget::GetExpectedResxHeaders(std::set<std::string>& headers,
+void cmGeneratorTarget::GetExpectedResxHeaders(std::set<std::string>& srcs,
const std::string& config) const
{
- HeadersCacheType::const_iterator it = this->ResxHeadersCache.find(config);
- if (it == ResxHeadersCache.end()) {
- ResxData data;
- IMPLEMENT_VISIT_IMPL(Resx, COMMA cmGeneratorTarget::ResxData)
- this->ResxHeadersCache[config] = data.ExpectedResxHeaders;
- } else {
- headers = it->second;
- }
+ ResxData data;
+ IMPLEMENT_VISIT_IMPL(Resx, COMMA cmGeneratorTarget::ResxData)
+ srcs = data.ExpectedResxHeaders;
}
void cmGeneratorTarget::GetResxSources(std::vector<cmSourceFile const*>& srcs,
@@ -753,14 +748,9 @@ void
cmGeneratorTarget::GetCertificates(std::vector<cmSourceFile const*>& data,
void cmGeneratorTarget::GetExpectedXamlHeaders(std::set<std::string>& headers,
const std::string& config) const
{
- HeadersCacheType::const_iterator it = this->XamlHeadersCache.find(config);
- if (it == XamlHeadersCache.end()) {
- XamlData data;
- IMPLEMENT_VISIT_IMPL(Xaml, COMMA cmGeneratorTarget::XamlData)
- this->XamlHeadersCache[config] = data.ExpectedXamlHeaders;
- } else {
- headers = it->second;
- }
+ XamlData data;
+ IMPLEMENT_VISIT_IMPL(Xaml, COMMA cmGeneratorTarget::XamlData)
+ headers = data.ExpectedXamlHeaders;
}
void cmGeneratorTarget::GetExpectedXamlSources(std::set<std::string>& srcs,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index e72e0a6..689fbda 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -739,10 +739,6 @@ private:
bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
std::string& out) const;
- typedef std::map<std::string, std::set<std::string> > HeadersCacheType;
- mutable HeadersCacheType ResxHeadersCache;
- mutable HeadersCacheType XamlHeadersCache;
-
public:
const std::vector<const cmGeneratorTarget*>& GetLinkImplementationClosure(
const std::string& config) const;
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorTarget.cxx | 24 +++++++-----------------
Source/cmGeneratorTarget.h | 4 ----
2 files changed, 7 insertions(+), 21 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
