Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-18 17:31:57 +08:00
Code Issues Projects Releases Wiki Activity

renames method FinalizeTargetCompileInfo() in FinalizeTargetConfiguration().

Browse Source
This commit is contained in:
Marc Chevrier
2022-09-07 14:23:21 +02:00
parent aa4da6944e
commit a47eef32a3
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGeneratorTarget.cxx
View File

@@ -8622,7 +8622,7 @@ bool cmGeneratorTarget::AddHeaderSetVerification()
verifyTarget->SetProperty("UNITY_BUILD", "OFF"); verifyTarget->SetProperty("UNITY_BUILD", "OFF");
cm::optional<std::map<std::string, cmValue>> cm::optional<std::map<std::string, cmValue>>
perConfigCompileDefinitions; perConfigCompileDefinitions;
verifyTarget->FinalizeTargetCompileInfo( verifyTarget->FinalizeTargetConfiguration(
this->Makefile->GetCompileDefinitionsEntries(), this->Makefile->GetCompileDefinitionsEntries(),
perConfigCompileDefinitions); perConfigCompileDefinitions);

8
Source/cmGlobalGenerator.cxx
View File

@@ -1501,7 +1501,7 @@ bool cmGlobalGenerator::Compute()
if (!this->CheckALLOW_DUPLICATE_CUSTOM_TARGETS()) { if (!this->CheckALLOW_DUPLICATE_CUSTOM_TARGETS()) {
return false; return false;
} }
this->FinalizeTargetCompileInfo(); this->FinalizeTargetConfiguration();
this->CreateGenerationObjects(); this->CreateGenerationObjects();
@@ -1825,7 +1825,7 @@ cmGlobalGenerator::CreateMSVC60LinkLineComputer(
cm::make_unique<cmMSVC60LinkLineComputer>(outputConverter, stateDir)); cm::make_unique<cmMSVC60LinkLineComputer>(outputConverter, stateDir));
} }
void cmGlobalGenerator::FinalizeTargetCompileInfo() void cmGlobalGenerator::FinalizeTargetConfiguration()
{ {
std::vector<std::string> const langs = std::vector<std::string> const langs =
this->CMakeInstance->GetState()->GetEnabledLanguages(); this->CMakeInstance->GetState()->GetEnabledLanguages();
@@ -1838,8 +1838,8 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
for (auto& target : mf->GetTargets()) { for (auto& target : mf->GetTargets()) {
cmTarget* t = &target.second; cmTarget* t = &target.second;
t->FinalizeTargetCompileInfo(noConfigCompileDefinitions, t->FinalizeTargetConfiguration(noConfigCompileDefinitions,
perConfigCompileDefinitions); perConfigCompileDefinitions);
} }
// The standard include directories for each language // The standard include directories for each language

2
Source/cmGlobalGenerator.h
View File

@@ -694,7 +694,7 @@ private:
void WriteSummary(); void WriteSummary();
void WriteSummary(cmGeneratorTarget* target); void WriteSummary(cmGeneratorTarget* target);
void FinalizeTargetCompileInfo(); void FinalizeTargetConfiguration();
virtual void ForceLinkerLanguages(); virtual void ForceLinkerLanguages();

2
Source/cmTarget.cxx
View File

@@ -1881,7 +1881,7 @@ void cmTarget::AppendBuildInterfaceIncludes()
} }
} }
void cmTarget::FinalizeTargetCompileInfo( void cmTarget::FinalizeTargetConfiguration(
const cmBTStringRange& noConfigCompileDefinitions, const cmBTStringRange& noConfigCompileDefinitions,
cm::optional<std::map<std::string, cmValue>>& perConfigCompileDefinitions) cm::optional<std::map<std::string, cmValue>>& perConfigCompileDefinitions)
{ {

2
Source/cmTarget.h
View File

@@ -236,7 +236,7 @@ public:
void InsertPrecompileHeader(BT<std::string> const& entry); void InsertPrecompileHeader(BT<std::string> const& entry);
void AppendBuildInterfaceIncludes(); void AppendBuildInterfaceIncludes();
void FinalizeTargetCompileInfo( void FinalizeTargetConfiguration(
const cmBTStringRange& noConfigCompileDefinitions, const cmBTStringRange& noConfigCompileDefinitions,
cm::optional<std::map<std::string, cmValue>>& perConfigCompileDefinitions); cm::optional<std::map<std::string, cmValue>>& perConfigCompileDefinitions);