summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Khouzam <gillesk@microsoft.com>2014-07-29 15:28:02 (GMT)
committerBrad King <brad.king@kitware.com>2014-07-31 14:46:00 (GMT)
commitfe161dc30daf4d329e74d0586f47780b4c127ed4 (patch)
tree39553d5e3cbdffa5d722652128ee91c3f43696fa
parent66edd06587bfaafc2cb1f24286925750454ec9cc (diff)
downloadCMake-fe161dc30daf4d329e74d0586f47780b4c127ed4.zip
CMake-fe161dc30daf4d329e74d0586f47780b4c127ed4.tar.gz
CMake-fe161dc30daf4d329e74d0586f47780b4c127ed4.tar.bz2
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.
-rw-r--r--Source/cmGlobalVisualStudio8Generator.cxx13
-rw-r--r--Source/cmGlobalVisualStudio8Generator.h3
2 files changed, 13 insertions, 3 deletions
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);