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 d99c2b95dcc5e8c5234312121dfa0a699bb3c30d (commit) via 973df7c0e94f0bbc0403c6e2038363a75bb81bca (commit) from 19b37e653d1e13b77e02e6f23bec87cda18d0a66 (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 ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d99c2b95dcc5e8c5234312121dfa0a699bb3c30d commit d99c2b95dcc5e8c5234312121dfa0a699bb3c30d Merge: 19b37e6 973df7c Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Oct 7 10:14:16 2010 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Oct 7 10:14:16 2010 -0400 Merge topic 'vs10-order-dependencies' into next 973df7c VS10: Order .vcxproj dependencies deterministically (#10502) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=973df7c0e94f0bbc0403c6e2038363a75bb81bca commit 973df7c0e94f0bbc0403c6e2038363a75bb81bca Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Oct 7 09:54:24 2010 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Oct 7 09:54:24 2010 -0400 VS10: Order .vcxproj dependencies deterministically (#10502) This avoids needless modification of the project files during regeneration. diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h index daa6b3a..c8ea339 100644 --- a/Source/cmGlobalVisualStudioGenerator.h +++ b/Source/cmGlobalVisualStudioGenerator.h @@ -69,14 +69,6 @@ public: i.e. "Can I build Debug and Release in the same tree?" */ virtual bool IsMultiConfig() { return true; } -protected: - // Does this VS version link targets to each other if there are - // dependencies in the SLN file? This was done for VS versions - // below 8. - virtual bool VSLinksDependencies() const { return true; } - - virtual const char* GetIDEVersion() = 0; - struct TargetCompare { bool operator()(cmTarget const* l, cmTarget const* r) const; @@ -87,6 +79,14 @@ protected: OrderedTargetDependSet(cmGlobalGenerator::TargetDependSet const&); }; +protected: + // Does this VS version link targets to each other if there are + // dependencies in the SLN file? This was done for VS versions + // below 8. + virtual bool VSLinksDependencies() const { return true; } + + virtual const char* GetIDEVersion() = 0; + virtual bool ComputeTargetDepends(); class VSDependSet: public std::set<cmStdString> {}; class VSDependMap: public std::map<cmTarget*, VSDependSet> {}; diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 9c0364b..524be8b 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1479,10 +1479,13 @@ void cmVisualStudio10TargetGenerator::WriteEvent( void cmVisualStudio10TargetGenerator::WriteProjectReferences() { - cmGlobalGenerator::TargetDependSet const& depends + cmGlobalGenerator::TargetDependSet const& unordered = this->GlobalGenerator->GetTargetDirectDepends(*this->Target); + typedef cmGlobalVisualStudioGenerator::OrderedTargetDependSet + OrderedTargetDependSet; + OrderedTargetDependSet depends(unordered); this->WriteString("<ItemGroup>\n", 1); - for( cmGlobalGenerator::TargetDependSet::const_iterator i = depends.begin(); + for( OrderedTargetDependSet::const_iterator i = depends.begin(); i != depends.end(); ++i) { cmTarget* dt = *i; ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalVisualStudioGenerator.h | 16 ++++++++-------- Source/cmVisualStudio10TargetGenerator.cxx | 7 +++++-- 2 files changed, 13 insertions(+), 10 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits