diff options
author | Robert Maynard <robert.maynard@kitware.com> | 2020-06-30 17:44:37 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-07-03 11:43:18 (GMT) |
commit | 7a969fe21d736b6c6755b5dc7a105f1427242cdd (patch) | |
tree | e5049985a624ff703b52dcff17fad5f60cfbff8c /Source/cmLocalVisualStudio7Generator.cxx | |
parent | 19f7588d3d715fdf3c32669fc756e2c68fbf1da5 (diff) | |
download | CMake-7a969fe21d736b6c6755b5dc7a105f1427242cdd.zip CMake-7a969fe21d736b6c6755b5dc7a105f1427242cdd.tar.gz CMake-7a969fe21d736b6c6755b5dc7a105f1427242cdd.tar.bz2 |
cmMakefile: Refactor API to better handle empty config values
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
-rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 5d50e2d..ad61ad3 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -1331,8 +1331,8 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout, const std::string& libName, cmGeneratorTarget* target) { - std::vector<std::string> configs; - this->Makefile->GetConfigurations(configs); + std::vector<std::string> configs = + this->Makefile->GetGeneratorConfigs(cmMakefile::ExcludeEmptyConfig); // We may be modifying the source groups temporarily, so make a copy. std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups(); @@ -1580,8 +1580,9 @@ cmLocalVisualStudio7GeneratorFCInfo::cmLocalVisualStudio7GeneratorFCInfo( std::string cmLocalVisualStudio7Generator::ComputeLongestObjectDirectory( cmGeneratorTarget const* target) const { - std::vector<std::string> configs; - target->Target->GetMakefile()->GetConfigurations(configs); + std::vector<std::string> configs = + target->Target->GetMakefile()->GetGeneratorConfigs( + cmMakefile::ExcludeEmptyConfig); // Compute the maximum length configuration name. std::string config_max; |