diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-16 14:23:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-11-16 14:23:45 (GMT) |
| commit | 45d4f81fde2c5c29698787e30b9bebb91211eb01 (patch) | |
| tree | 14adc26c1cd0d7f015f7bd23a81f72652f416230 /Source/cmGlobalVisualStudio71Generator.h | |
| parent | 694322ecea7725e5e00e3d46c09e0588afc633db (diff) | |
| parent | 739f16653d823ea9519405da837cd57dcf204403 (diff) | |
| download | CMake-45d4f81fde2c5c29698787e30b9bebb91211eb01.zip CMake-45d4f81fde2c5c29698787e30b9bebb91211eb01.tar.gz CMake-45d4f81fde2c5c29698787e30b9bebb91211eb01.tar.bz2 | |
Merge topic 'per-config-EXCLUDE_FROM_DEFAULT_BUILD' into vs-global-sections
Conflicts:
Source/cmGlobalVisualStudio7Generator.h
Diffstat (limited to 'Source/cmGlobalVisualStudio71Generator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio71Generator.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h index dc8cfeb..f96a7d9 100644 --- a/Source/cmGlobalVisualStudio71Generator.h +++ b/Source/cmGlobalVisualStudio71Generator.h @@ -61,10 +61,10 @@ protected: const char* name, const char* path, cmTarget &t); virtual void WriteProjectDepends(std::ostream& fout, const char* name, const char* path, cmTarget &t); - virtual void WriteProjectConfigurations(std::ostream& fout, - const char* name, - bool partOfDefaultBuild, - const char* platformMapping = NULL); + virtual void WriteProjectConfigurations( + std::ostream& fout, const char* name, + const std::set<std::string>& configsPartOfDefaultBuild, + const char* platformMapping = NULL); virtual void WriteExternalProject(std::ostream& fout, const char* name, const char* path, |