diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-20 16:47:35 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-11-20 16:47:35 (GMT) |
| commit | 508504ab6f76bfd90a11a77cc1e59e604d41c47a (patch) | |
| tree | 2713a8bb8ea84ace1c4359504ea7562b7a112ad2 /Source/cmGlobalVisualStudio8Generator.cxx | |
| parent | f673b3824708986bdb763cefd70898adc5701a82 (diff) | |
| parent | 739f16653d823ea9519405da837cd57dcf204403 (diff) | |
| download | CMake-508504ab6f76bfd90a11a77cc1e59e604d41c47a.zip CMake-508504ab6f76bfd90a11a77cc1e59e604d41c47a.tar.gz CMake-508504ab6f76bfd90a11a77cc1e59e604d41c47a.tar.bz2 | |
Merge topic 'per-config-EXCLUDE_FROM_DEFAULT_BUILD'
739f166 Serialize tests for EXCLUDE_FROM_DEFAULT_BUILD
e31d83b Define property EXCLUDE_FROM_DEFAULT_BUILD
d1f8828 Add property EXCLUDE_FROM_DEFAULT_BUILD_<CONFIG>
b777272 Add tests for EXCLUDE_FROM_DEFAULT_BUILD
Diffstat (limited to 'Source/cmGlobalVisualStudio8Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio8Generator.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index a6ed2a6..c3ec3f2 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -257,9 +257,10 @@ cmGlobalVisualStudio8Generator //---------------------------------------------------------------------------- void cmGlobalVisualStudio8Generator -::WriteProjectConfigurations(std::ostream& fout, const char* name, - bool partOfDefaultBuild, - const char* platformMapping) +::WriteProjectConfigurations( + std::ostream& fout, const char* name, + const std::set<std::string>& configsPartOfDefaultBuild, + const char* platformMapping) { std::string guid = this->GetGUID(name); for(std::vector<std::string>::iterator i = this->Configurations.begin(); @@ -269,7 +270,9 @@ cmGlobalVisualStudio8Generator << "|" << this->GetPlatformName() << ".ActiveCfg = " << *i << "|" << (platformMapping ? platformMapping : this->GetPlatformName()) << "\n"; - if(partOfDefaultBuild) + std::set<std::string>::const_iterator + ci = configsPartOfDefaultBuild.find(*i); + if(!(ci == configsPartOfDefaultBuild.end())) { fout << "\t\t{" << guid << "}." << *i << "|" << this->GetPlatformName() << ".Build.0 = " << *i << "|" |