[Cmake-commits] CMake branch, next, updated. v3.0.0-4691-g66f8a0e

[Brad King]

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  66f8a0e90c775b1eec4e625e16a475350653c3a6 (commit)
       via  fe161dc30daf4d329e74d0586f47780b4c127ed4 (commit)
      from  d835f7e28f36029f742128b593dda13bcb2d05f0 (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=66f8a0e90c775b1eec4e625e16a475350653c3a6
commit 66f8a0e90c775b1eec4e625e16a475350653c3a6
Merge: d835f7e fe161dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 31 10:54:56 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 31 10:54:56 2014 -0400

    Merge topic 'vs-refactor-sln-deploy' into next
    
    fe161dc3 VS: Refactor logic deciding to add "Deploy" to the .sln file


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe161dc30daf4d329e74d0586f47780b4c127ed4
commit fe161dc30daf4d329e74d0586f47780b4c127ed4
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Tue Jul 29 11:28:02 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 31 10:46:00 2014 -0400

    VS: Refactor logic deciding to add "Deploy" to the .sln file
    
    Move the condition to a "NeedsDeploy" virtual method that can be
    overridden by more recent VS generators.

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 9fd3d5a..6bfef68 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -398,9 +398,7 @@ cmGlobalVisualStudio8Generator
                platformMapping : this->GetPlatformName())
            << "\n";
       }
-    bool needsDeploy = (type == cmTarget::EXECUTABLE ||
-                        type == cmTarget::SHARED_LIBRARY);
-    if(this->TargetsWindowsCE() && needsDeploy)
+    if(this->NeedsDeploy(type))
       {
       fout << "\t\t{" << guid << "}." << *i
            << "|" << this->GetPlatformName() << ".Deploy.0 = " << *i << "|"
@@ -412,6 +410,15 @@ cmGlobalVisualStudio8Generator
 }
 
 //----------------------------------------------------------------------------
+bool
+cmGlobalVisualStudio8Generator::NeedsDeploy(cmTarget::TargetType type) const
+{
+  bool needsDeploy = (type == cmTarget::EXECUTABLE ||
+                      type == cmTarget::SHARED_LIBRARY);
+  return this->TargetsWindowsCE() && needsDeploy;
+}
+
+//----------------------------------------------------------------------------
 bool cmGlobalVisualStudio8Generator::ComputeTargetDepends()
 {
   // Skip over the cmGlobalVisualStudioGenerator implementation!
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index d7e1f3a..cb6d3d9 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -77,6 +77,9 @@ protected:
 
   bool AddCheckTarget();
 
+  /** Return true if the configuration needs to be deployed */
+  virtual bool NeedsDeploy(cmTarget::TargetType type) const;
+
   static cmIDEFlagTable const* GetExtraFlagTableVS8();
   virtual void WriteSLNHeader(std::ostream& fout);
   virtual void WriteSolutionConfigurations(std::ostream& fout);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio8Generator.cxx |   13 ++++++++++---
 Source/cmGlobalVisualStudio8Generator.h   |    3 +++
 2 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake