diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-07 18:25:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-07 18:25:37 (GMT) |
| commit | 18527c4991a5f555c0464270ca283d37632b9395 (patch) | |
| tree | cdc9ecc11a656583305bcbafb1afbd5af979db0d /Source | |
| parent | 6b9e2f710054da4acb67240670ba75b22044d3a5 (diff) | |
| parent | a6e4e73da3de092439b6fcfe884f44a7c8a1ad81 (diff) | |
| download | CMake-18527c4991a5f555c0464270ca283d37632b9395.zip CMake-18527c4991a5f555c0464270ca283d37632b9395.tar.gz CMake-18527c4991a5f555c0464270ca283d37632b9395.tar.bz2 | |
Merge topic 'vs-install-in-default-build'
a6e4e73d VS: Add option to put INSTALL target in .sln default build
562e69dd Tests: Enable devenv tests on VS >= 10
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index de90f7e..ead5ddc 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -1031,6 +1031,24 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild( int type = target->GetType(); if (type == cmTarget::GLOBAL_TARGET) { + // check if INSTALL target is part of default build + if(target->GetName() == "INSTALL") + { + // inspect CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD properties + for(std::vector<std::string>::iterator i = this->Configurations.begin(); + i != this->Configurations.end(); ++i) + { + const char* propertyValue = target->GetMakefile() + ->GetDefinition("CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD"); + cmGeneratorExpression ge; + cmsys::auto_ptr<cmCompiledGeneratorExpression> + cge = ge.Parse(propertyValue); + if(cmSystemTools::IsOn(cge->Evaluate(target->GetMakefile(), *i))) + { + activeConfigs.insert(*i); + } + } + } return activeConfigs; } if(type == cmTarget::UTILITY && !this->IsDependedOn(projectTargets, target)) |