diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-26 16:10:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-26 16:10:08 (GMT) |
| commit | 2621efac19e0538f0f92f69ecab60db184c70953 (patch) | |
| tree | 2c5c4d365ee1d17b89a9263bcd1350457be9bd22 /Source/cmGlobalVisualStudio8Generator.cxx | |
| parent | 28a296b6c43f87e6b148c2207062fcc9a09961a1 (diff) | |
| parent | 917c035ada212cec47f92b51449b554526119372 (diff) | |
| download | CMake-2621efac19e0538f0f92f69ecab60db184c70953.zip CMake-2621efac19e0538f0f92f69ecab60db184c70953.tar.gz CMake-2621efac19e0538f0f92f69ecab60db184c70953.tar.bz2 | |
Merge topic 'vs-wince-no-deploy'
917c035ada VS: support suppressing deployment of selected targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2991
Diffstat (limited to 'Source/cmGlobalVisualStudio8Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio8Generator.cxx | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index ceb56d1..21abdf7 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -273,7 +273,7 @@ void cmGlobalVisualStudio8Generator::WriteProjectConfigurations( : this->GetPlatformName()) << "\n"; } - if (this->NeedsDeploy(target.GetType())) { + if (this->NeedsDeploy(target, dstConfig)) { fout << "\t\t{" << guid << "}." << i << "|" << this->GetPlatformName() << ".Deploy.0 = " << dstConfig << "|" << (!platformMapping.empty() ? platformMapping @@ -284,11 +284,32 @@ void cmGlobalVisualStudio8Generator::WriteProjectConfigurations( } bool cmGlobalVisualStudio8Generator::NeedsDeploy( - cmStateEnums::TargetType type) const + cmGeneratorTarget const& target, const char* config) const { - bool needsDeploy = - (type == cmStateEnums::EXECUTABLE || type == cmStateEnums::SHARED_LIBRARY); - return this->TargetsWindowsCE() && needsDeploy; + cmStateEnums::TargetType type = target.GetType(); + bool noDeploy = DeployInhibited(target, config); + return !noDeploy && + (type == cmStateEnums::EXECUTABLE || + type == cmStateEnums::SHARED_LIBRARY) && + this->TargetSystemSupportsDeployment(); +} + +bool cmGlobalVisualStudio8Generator::DeployInhibited( + cmGeneratorTarget const& target, const char* config) const +{ + bool rVal = false; + if (const char* propStr = target.GetProperty("VS_NO_SOLUTION_DEPLOY")) { + cmGeneratorExpression ge; + std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(propStr); + std::string prop = cge->Evaluate(target.LocalGenerator, config); + rVal = cmSystemTools::IsOn(prop); + } + return rVal; +} + +bool cmGlobalVisualStudio8Generator::TargetSystemSupportsDeployment() const +{ + return this->TargetsWindowsCE(); } bool cmGlobalVisualStudio8Generator::ComputeTargetDepends() |