mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-12 00:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmGeneratorTarget: Convert GetAppleArchs output argument to return value

Browse Source
This commit is contained in:
Brad King
2023-03-14 17:01:45 -04:00
parent 1ec4c65791
commit 93afe804ce
7 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFileAPICodemodel.cxx
+2 -2
View File
@@ -1355,8 +1355,8 @@ CompileData Target::BuildCompileData(cmSourceFile* sf)
}
// Add precompile headers compile options.
std::vector<std::string> architectures;
this->GT->GetAppleArchs(this->Config, architectures);
std::vector<std::string> architectures =
this->GT->GetAppleArchs(this->Config);
if (architectures.empty()) {
architectures.emplace_back();
}
Source/cmGeneratorTarget.cxx
+5 -3
View File
@@ -3448,11 +3448,12 @@ std::string cmGeneratorTarget::GetCompilePDBDirectory(
return "";
}
void cmGeneratorTarget::GetAppleArchs(const std::string& config,
std::vector<std::string>& archVec) const
std::vector<std::string> cmGeneratorTarget::GetAppleArchs(
std::string const& config) const
{
std::vector<std::string> archVec;
if (!this->IsApple()) {
return;
return archVec;
}
cmValue archs = nullptr;
if (!config.empty()) {
@@ -3469,6 +3470,7 @@ void cmGeneratorTarget::GetAppleArchs(const std::string& config,
if (archVec.empty()) {
this->Makefile->GetDefExpandList("_CMAKE_APPLE_ARCHS_DEFAULT", archVec);
}
return archVec;
}
void cmGeneratorTarget::AddExplicitLanguageFlags(std::string& flags,
Source/cmGeneratorTarget.h
+1 -2
View File
@@ -484,8 +484,7 @@ public:
holding object files for the given configuration. */
std::string GetObjectDirectory(std::string const& config) const;
void GetAppleArchs(const std::string& config,
std::vector<std::string>& archVec) const;
std::vector<std::string> GetAppleArchs(std::string const& config) const;
void AddExplicitLanguageFlags(std::string& flags,
cmSourceFile const& sf) const;
Source/cmGlobalXCodeGenerator.cxx
+1 -2
View File
@@ -2513,8 +2513,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
}
// Set target-specific architectures.
std::vector<std::string> archs;
gtgt->GetAppleArchs(configName, archs);
std::vector<std::string> archs = gtgt->GetAppleArchs(configName);
if (!archs.empty()) {
// Enable ARCHS attribute.
Source/cmLocalGenerator.cxx
+2 -3
View File
@@ -1873,8 +1873,7 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags,
{
// Only add Apple specific flags on Apple platforms
if (target->IsApple() && this->EmitUniversalBinaryFlags) {
std::vector<std::string> archs;
target->GetAppleArchs(config, archs);
std::vector<std::string> archs = target->GetAppleArchs(config);
if (!archs.empty() &&
(lang == "C" || lang == "CXX" || lang == "OBJC" || lang == "OBJCXX" ||
lang == "ASM")) {
@@ -2594,7 +2593,7 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target)
std::vector<std::string> architectures;
if (!this->GetGlobalGenerator()->IsXcode()) {
target->GetAppleArchs(config, architectures);
architectures = target->GetAppleArchs(config);
}
if (architectures.empty()) {
architectures.emplace_back();
Source/cmMakefileTargetGenerator.cxx
+4 -4
View File
@@ -541,8 +541,8 @@ void cmMakefileTargetGenerator::WriteTargetLanguageFlags()
*this->FlagFileStream << language << "_DEFINES = " << defines << "\n\n";
*this->FlagFileStream << language << "_INCLUDES = " << includes << "\n\n";
std::vector<std::string> architectures;
this->GeneratorTarget->GetAppleArchs(this->GetConfigName(), architectures);
std::vector<std::string> architectures =
this->GeneratorTarget->GetAppleArchs(this->GetConfigName());
architectures.emplace_back();
for (const std::string& arch : architectures) {
@@ -671,8 +671,8 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(
std::string configUpper = cmSystemTools::UpperCase(config);
// Add precompile headers dependencies
std::vector<std::string> architectures;
this->GeneratorTarget->GetAppleArchs(config, architectures);
std::vector<std::string> architectures =
this->GeneratorTarget->GetAppleArchs(config);
if (architectures.empty()) {
architectures.emplace_back();
}
Source/cmNinjaTargetGenerator.cxx
+4 -4
View File
@@ -169,9 +169,9 @@ std::string cmNinjaTargetGenerator::ComputeFlagsForObject(
cmSourceFile const* source, const std::string& language,
const std::string& config)
{
std::vector<std::string> architectures;
std::unordered_map<std::string, std::string> pchSources;
this->GeneratorTarget->GetAppleArchs(config, architectures);
std::vector<std::string> architectures =
this->GeneratorTarget->GetAppleArchs(config);
if (architectures.empty()) {
architectures.emplace_back();
}
@@ -1390,8 +1390,8 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
// Add precompile headers dependencies
std::vector<std::string> depList;
std::vector<std::string> architectures;
this->GeneratorTarget->GetAppleArchs(config, architectures);
std::vector<std::string> architectures =
this->GeneratorTarget->GetAppleArchs(config);
if (architectures.empty()) {
architectures.emplace_back();
}