Update upstream source from tag 'upstream/3.28.3'

Update to upstream version '3.28.3'
with Debian dir 7f6b6baaa6
ci/unstable
Timo Röhling 11 months ago
commit 758004f573

@ -201,8 +201,8 @@ Updates
Changes made since CMake 3.28.0 include the following. Changes made since CMake 3.28.0 include the following.
3.28.1, 3.28.2 3.28.1, 3.28.2, 3.28.3
-------------- ----------------------
* These versions made no changes to documented features or interfaces. * These versions made no changes to documented features or interfaces.
Some implementation updates were made to support ecosystem changes Some implementation updates were made to support ecosystem changes

@ -1,7 +1,7 @@
# CMake version number components. # CMake version number components.
set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 28) set(CMake_VERSION_MINOR 28)
set(CMake_VERSION_PATCH 2) set(CMake_VERSION_PATCH 3)
#set(CMake_VERSION_RC 0) #set(CMake_VERSION_RC 0)
set(CMake_VERSION_IS_DIRTY 0) set(CMake_VERSION_IS_DIRTY 0)
@ -21,7 +21,7 @@ endif()
if(NOT CMake_VERSION_NO_GIT) if(NOT CMake_VERSION_NO_GIT)
# If this source was exported by 'git archive', use its commit info. # If this source was exported by 'git archive', use its commit info.
set(git_info [==[1f25aa1a0a CMake 3.28.2]==]) set(git_info [==[5e984bb352 CMake 3.28.3]==])
# Otherwise, try to identify the current development source version. # Otherwise, try to identify the current development source version.
if(NOT git_info MATCHES "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]?[0-9a-f]?)[0-9a-f]* " if(NOT git_info MATCHES "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]?[0-9a-f]?)[0-9a-f]* "

@ -1543,10 +1543,7 @@ bool cmGlobalGenerator::Compute()
// so create the map from project name to vector of local generators // so create the map from project name to vector of local generators
this->FillProjectMap(); this->FillProjectMap();
// Add automatically generated sources (e.g. unity build). this->CreateFileGenerateOutputs();
if (!this->AddAutomaticSources()) {
return false;
}
// Iterate through all targets and add verification targets for header sets // Iterate through all targets and add verification targets for header sets
if (!this->AddHeaderSetVerification()) { if (!this->AddHeaderSetVerification()) {
@ -1587,10 +1584,11 @@ bool cmGlobalGenerator::Compute()
} }
} }
// Add automatically generated sources (e.g. unity build).
// Add unity sources after computing compile features. Unity sources do // Add unity sources after computing compile features. Unity sources do
// not change the set of languages or features, but we need to know them // not change the set of languages or features, but we need to know them
// to filter out sources that are scanned for C++ module dependencies. // to filter out sources that are scanned for C++ module dependencies.
if (!this->AddUnitySources()) { if (!this->AddAutomaticSources()) {
return false; return false;
} }
@ -1860,16 +1858,21 @@ bool cmGlobalGenerator::AddHeaderSetVerification()
return true; return true;
} }
bool cmGlobalGenerator::AddAutomaticSources() void cmGlobalGenerator::CreateFileGenerateOutputs()
{ {
for (const auto& lg : this->LocalGenerators) { for (const auto& lg : this->LocalGenerators) {
lg->CreateEvaluationFileOutputs(); lg->CreateEvaluationFileOutputs();
} }
}
bool cmGlobalGenerator::AddAutomaticSources()
{
for (const auto& lg : this->LocalGenerators) { for (const auto& lg : this->LocalGenerators) {
for (const auto& gt : lg->GetGeneratorTargets()) { for (const auto& gt : lg->GetGeneratorTargets()) {
if (!gt->CanCompileSources()) { if (!gt->CanCompileSources()) {
continue; continue;
} }
lg->AddUnityBuild(gt.get());
lg->AddISPCDependencies(gt.get()); lg->AddISPCDependencies(gt.get());
// Targets that reuse a PCH are handled below. // Targets that reuse a PCH are handled below.
if (!gt->GetProperty("PRECOMPILE_HEADERS_REUSE_FROM")) { if (!gt->GetProperty("PRECOMPILE_HEADERS_REUSE_FROM")) {
@ -1889,29 +1892,8 @@ bool cmGlobalGenerator::AddAutomaticSources()
} }
} }
} }
// The above transformations may have changed the classification of sources. // The above transformations may have changed the classification of sources,
// Clear the source list and classification cache (KindedSources) of all // e.g., sources that go into unity builds become SourceKindUnityBatched.
// targets so that it will be recomputed correctly by the generators later
// now that the above transformations are done for all targets.
for (const auto& lg : this->LocalGenerators) {
for (const auto& gt : lg->GetGeneratorTargets()) {
gt->ClearSourcesCache();
}
}
return true;
}
bool cmGlobalGenerator::AddUnitySources()
{
for (const auto& lg : this->LocalGenerators) {
for (const auto& gt : lg->GetGeneratorTargets()) {
if (!gt->CanCompileSources()) {
continue;
}
lg->AddUnityBuild(gt.get());
}
}
// The above transformation may have changed the classification of sources.
// Clear the source list and classification cache (KindedSources) of all // Clear the source list and classification cache (KindedSources) of all
// targets so that it will be recomputed correctly by the generators later // targets so that it will be recomputed correctly by the generators later
// now that the above transformations are done for all targets. // now that the above transformations are done for all targets.

@ -676,8 +676,8 @@ protected:
bool AddHeaderSetVerification(); bool AddHeaderSetVerification();
void CreateFileGenerateOutputs();
bool AddAutomaticSources(); bool AddAutomaticSources();
bool AddUnitySources();
std::string SelectMakeProgram(const std::string& makeProgram, std::string SelectMakeProgram(const std::string& makeProgram,
const std::string& makeDefault = "") const; const std::string& makeDefault = "") const;

@ -3131,6 +3131,7 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target)
for (size_t ci = 0; ci < configs.size(); ++ci) { for (size_t ci = 0; ci < configs.size(); ++ci) {
// FIXME: Refactor collection of sources to not evaluate object libraries. // FIXME: Refactor collection of sources to not evaluate object libraries.
// Their final set of object files might be transformed by unity builds.
std::vector<cmSourceFile*> sources; std::vector<cmSourceFile*> sources;
target->GetSourceFiles(sources, configs[ci]); target->GetSourceFiles(sources, configs[ci]);
for (cmSourceFile* sf : sources) { for (cmSourceFile* sf : sources) {

@ -0,0 +1 @@
include(${CMAKE_CURRENT_LIST_DIR}/PchInterface-check.cmake)

@ -0,0 +1,2 @@
set(CMAKE_UNITY_BUILD 1)
include(PchInterface.cmake)

@ -12,6 +12,7 @@ endfunction()
run_cmake(DisabledPch) run_cmake(DisabledPch)
run_cmake(PchDebugGenex) run_cmake(PchDebugGenex)
run_test(PchInterface) run_test(PchInterface)
run_test(PchInterfaceUnity)
run_cmake(PchPrologueEpilogue) run_cmake(PchPrologueEpilogue)
run_test(SkipPrecompileHeaders) run_test(SkipPrecompileHeaders)
run_test(CXXnotC) run_test(CXXnotC)

@ -8,7 +8,7 @@ readonly name="zlib"
readonly ownership="zlib upstream <kwrobot@kitware.com>" readonly ownership="zlib upstream <kwrobot@kitware.com>"
readonly subtree="Utilities/cmzlib" readonly subtree="Utilities/cmzlib"
readonly repo="https://github.com/madler/zlib.git" readonly repo="https://github.com/madler/zlib.git"
readonly tag="v1.2.13" readonly tag="v1.2.13" # When updating, sync Copyright.txt below!
readonly shortlog=false readonly shortlog=false
readonly paths=" readonly paths="
README README
@ -45,7 +45,7 @@ extract_source () {
pushd "${extractdir}/${name}-reduced" pushd "${extractdir}/${name}-reduced"
echo "* -whitespace" > .gitattributes echo "* -whitespace" > .gitattributes
echo -n "'zlib' general purpose compression library echo -n "'zlib' general purpose compression library
version 1.2.12, March 27th, 2022 version 1.2.13, October 13th, 2022
Copyright " > Copyright.txt Copyright " > Copyright.txt
sed -n '/^ (C) 1995-/,+19 {s/^ \?//;p}' README >> Copyright.txt sed -n '/^ (C) 1995-/,+19 {s/^ \?//;p}' README >> Copyright.txt

@ -1,5 +1,5 @@
'zlib' general purpose compression library 'zlib' general purpose compression library
version 1.2.12, March 27th, 2022 version 1.2.13, October 13th, 2022
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler

Loading…
Cancel
Save