diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2019-08-11 09:56:59 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2019-08-14 14:33:20 (GMT) |
commit | f4f3c68926492e5660c4e66d5cdcf2298619c1b9 (patch) | |
tree | a559edb65acf4fa1583c90031e81462258494d8d /Source/cmGlobalXCodeGenerator.cxx | |
parent | ff42dec89143c3b8027c9768c2910ca270ddd951 (diff) | |
download | CMake-f4f3c68926492e5660c4e66d5cdcf2298619c1b9.zip CMake-f4f3c68926492e5660c4e66d5cdcf2298619c1b9.tar.gz CMake-f4f3c68926492e5660c4e66d5cdcf2298619c1b9.tar.bz2 |
Source code: Use cmExpandList instead of cmSystemTools::ExpandListArgument
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index e3cafe3..19e64e4 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -882,7 +882,7 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile( if (extraFileAttributes) { // Expand the list of attributes. std::vector<std::string> attributes; - cmSystemTools::ExpandListArgument(extraFileAttributes, attributes); + cmExpandList(extraFileAttributes, attributes); // Store the attributes. for (const auto& attribute : attributes) { @@ -2482,10 +2482,8 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateUtilityTarget( std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target, cmGeneratorTarget* gtgt) { - std::vector<std::string> const configVector = - cmSystemTools::ExpandedListArgument( - this->CurrentMakefile->GetRequiredDefinition( - "CMAKE_CONFIGURATION_TYPES")); + std::vector<std::string> const configVector = cmExpandedList( + this->CurrentMakefile->GetRequiredDefinition("CMAKE_CONFIGURATION_TYPES")); cmXCodeObject* configlist = this->CreateObject(cmXCodeObject::XCConfigurationList); cmXCodeObject* buildConfigurations = @@ -3223,8 +3221,7 @@ void cmGlobalXCodeGenerator::ComputeArchitectures(cmMakefile* mf) const char* osxArch = mf->GetDefinition("CMAKE_OSX_ARCHITECTURES"); const char* sysroot = mf->GetDefinition("CMAKE_OSX_SYSROOT"); if (osxArch && sysroot) { - cmSystemTools::ExpandListArgument(std::string(osxArch), - this->Architectures); + cmExpandList(std::string(osxArch), this->Architectures); } if (this->Architectures.empty()) { @@ -3627,7 +3624,7 @@ void cmGlobalXCodeGenerator::AppendDefines(BuildObjectListOrString& defs, // Expand the list of definitions. std::vector<std::string> defines; - cmSystemTools::ExpandListArgument(defines_list, defines); + cmExpandList(defines_list, defines); // Store the definitions in the string. this->AppendDefines(defs, defines, dflag); |