From ad3ae50adfde825ecb837f80655b1d40a5d6b2d5 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Nov 2024 14:17:02 -0500 Subject: [PATCH 01/14] cmLinkItem: Remove incorrect CMP0003_ prefix on function The `ComputeLinkType` function is not related to CMP0003. --- Source/cmComputeLinkDepends.cxx | 2 +- Source/cmGeneratorTarget_Link.cxx | 3 +-- Source/cmLinkItem.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index d279f3f367..39bd180e05 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -610,7 +610,7 @@ cmComputeLinkDepends::cmComputeLinkDepends(const cmGeneratorTarget* target, , DebugMode(this->Makefile->IsOn("CMAKE_LINK_DEPENDS_DEBUG_MODE") || this->Target->GetProperty("LINK_DEPENDS_DEBUG_MODE").IsOn()) , LinkLanguage(linkLanguage) - , LinkType(CMP0003_ComputeLinkType( + , LinkType(ComputeLinkType( this->Config, this->Makefile->GetCMakeInstance()->GetDebugConfigs())) , Strategy(strategy) diff --git a/Source/cmGeneratorTarget_Link.cxx b/Source/cmGeneratorTarget_Link.cxx index ee1c91f3c6..eaa56390d8 100644 --- a/Source/cmGeneratorTarget_Link.cxx +++ b/Source/cmGeneratorTarget_Link.cxx @@ -1449,8 +1449,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries( std::vector debugConfigs = this->Makefile->GetCMakeInstance()->GetDebugConfigs(); - cmTargetLinkLibraryType linkType = - CMP0003_ComputeLinkType(config, debugConfigs); + cmTargetLinkLibraryType linkType = ComputeLinkType(config, debugConfigs); cmTarget::LinkLibraryVectorType const& oldllibs = this->Target->GetOriginalLinkLibraries(); diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h index 70efb16abd..4ef0566c54 100644 --- a/Source/cmLinkItem.h +++ b/Source/cmLinkItem.h @@ -153,7 +153,7 @@ struct cmOptionalLinkImplementation : public cmLinkImplementation }; /** Compute the link type to use for the given configuration. */ -inline cmTargetLinkLibraryType CMP0003_ComputeLinkType( +inline cmTargetLinkLibraryType ComputeLinkType( const std::string& config, std::vector const& debugConfigs) { // No configuration is always optimized. From aaebad0993651c279f5ea5dfae412fb50d78fbd3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Nov 2024 13:40:04 -0500 Subject: [PATCH 02/14] cmPolicies: Factor out helper to recognize generated cmake_policy calls --- Source/cmPolicies.cxx | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index 57a3b81e01..9fb6fc3970 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -277,6 +277,17 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, warnCompat); } +namespace { +bool IsFromLegacyInstallEXPORT(cmMakefile* mf, unsigned int majorVer, + unsigned int minorVer, unsigned int patchVer) +{ + return majorVer == 2 && minorVer == 6 && patchVer == 0 && + mf->GetStateSnapshot().CanPopPolicyScope() && + cmSystemTools::Strucmp(mf->GetBacktrace().Top().Name.c_str(), + "cmake_policy") == 0; +} +} + bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, unsigned int majorVer, unsigned int minorVer, unsigned int patchVer, @@ -285,12 +296,9 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, unsigned int majorVer, // Warn about policy versions for which support will be removed. if (warnCompat == WarnCompat::On && (majorVer < 3 || (majorVer == 3 && minorVer < 10)) && - // Avoid warning on calls generated by install(EXPORT) + // Silently tolerate cmake_policy calls generated by install(EXPORT) // in CMake versions prior to 3.18. - !(majorVer == 2 && minorVer == 6 && patchVer == 0 && - mf->GetStateSnapshot().CanPopPolicyScope() && - cmSystemTools::Strucmp(mf->GetBacktrace().Top().Name.c_str(), - "cmake_policy") == 0)) { + !IsFromLegacyInstallEXPORT(mf, majorVer, minorVer, patchVer)) { mf->IssueMessage( MessageType::DEPRECATION_WARNING, "Compatibility with CMake < 3.10 will be removed from " From b97b1d1ed41ac9ac337433f7c0540b1e70e4c004 Mon Sep 17 00:00:00 2001 From: Brad King Date: Sat, 16 Nov 2024 08:12:58 -0500 Subject: [PATCH 03/14] cmPolicies: Factor out macro to old VERSION update advice --- Source/cmPolicies.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index 9fb6fc3970..fa64029104 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -286,6 +286,10 @@ bool IsFromLegacyInstallEXPORT(cmMakefile* mf, unsigned int majorVer, cmSystemTools::Strucmp(mf->GetBacktrace().Top().Name.c_str(), "cmake_policy") == 0; } +#define ADVICE_UPDATE_VERSION_ARGUMENT \ + "Update the VERSION argument value. Or, use the ... " \ + "syntax to tell CMake that the project requires at least but has " \ + "been updated to work with policies introduced by or earlier." } bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, unsigned int majorVer, @@ -302,10 +306,7 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, unsigned int majorVer, mf->IssueMessage( MessageType::DEPRECATION_WARNING, "Compatibility with CMake < 3.10 will be removed from " - "a future version of CMake.\n" - "Update the VERSION argument value. Or, use the ... " - "syntax to tell CMake that the project requires at least but has " - "been updated to work with policies introduced by or earlier."); + "a future version of CMake.\n" ADVICE_UPDATE_VERSION_ARGUMENT); } // now loop over all the policies and set them as appropriate From a35f4cbbca7112cf889d2c37661494237482016f Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 18 Nov 2024 19:20:12 -0500 Subject: [PATCH 04/14] cmGeneratorTarget: Remove unused ComputeLinkInterface signature --- Source/cmGeneratorTarget.h | 3 --- Source/cmGeneratorTarget_Link.cxx | 7 ------- 2 files changed, 10 deletions(-) diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 8ae98e8eac..93ad11919b 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -264,9 +264,6 @@ public: cmLinkInterface const* GetLinkInterface( const std::string& config, const cmGeneratorTarget* headTarget) const; - void ComputeLinkInterface(const std::string& config, - cmOptionalLinkInterface& iface, - const cmGeneratorTarget* head) const; enum class UseTo { diff --git a/Source/cmGeneratorTarget_Link.cxx b/Source/cmGeneratorTarget_Link.cxx index eaa56390d8..87c41b46de 100644 --- a/Source/cmGeneratorTarget_Link.cxx +++ b/Source/cmGeneratorTarget_Link.cxx @@ -683,13 +683,6 @@ cmLinkInterface const* cmGeneratorTarget::GetLinkInterface( return iface.Exists ? &iface : nullptr; } -void cmGeneratorTarget::ComputeLinkInterface( - const std::string& config, cmOptionalLinkInterface& iface, - cmGeneratorTarget const* headTarget) const -{ - this->ComputeLinkInterface(config, iface, headTarget, false); -} - void cmGeneratorTarget::ComputeLinkInterface( const std::string& config, cmOptionalLinkInterface& iface, cmGeneratorTarget const* headTarget, bool secondPass) const From 68a07a6610f9cbc8141667c13a6fa136085f2ba4 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 15 Nov 2024 17:54:24 -0500 Subject: [PATCH 05/14] Tests: Add missing cmake_minimum_required calls --- Tests/EmptyProperty/CMakeLists.txt | 1 + Tests/LibName/CMakeLists.txt | 1 + Tests/LinkLine/CMakeLists.txt | 1 + Tests/LinkLineOrder/CMakeLists.txt | 1 + Tests/PreOrder/CMakeLists.txt | 1 + Tests/RunCMake/XcodeProject/LinkBinariesBuildPhase.cmake | 1 + Tests/SBCS/CMakeLists.txt | 2 +- Tests/VSExternalInclude/Lib1/CMakeLists.txt | 1 + Tests/VSExternalInclude/Lib2/CMakeLists.txt | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Tests/EmptyProperty/CMakeLists.txt b/Tests/EmptyProperty/CMakeLists.txt index 39e75f36a9..b6f393c357 100644 --- a/Tests/EmptyProperty/CMakeLists.txt +++ b/Tests/EmptyProperty/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.10) project (EmptyProperty) set_property(DIRECTORY APPEND diff --git a/Tests/LibName/CMakeLists.txt b/Tests/LibName/CMakeLists.txt index b8f0890927..3624f961a0 100644 --- a/Tests/LibName/CMakeLists.txt +++ b/Tests/LibName/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.10) project(LibName) # this is a test to make sure that relative path # LIBRARY_OUTPUT_PATH and EXECUTABLE_OUTPUT_PATH work diff --git a/Tests/LinkLine/CMakeLists.txt b/Tests/LinkLine/CMakeLists.txt index 6154dd4694..0e7ff4798c 100644 --- a/Tests/LinkLine/CMakeLists.txt +++ b/Tests/LinkLine/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.10) project( LinkLine ) # Makes sure that the library order as specified by the user are diff --git a/Tests/LinkLineOrder/CMakeLists.txt b/Tests/LinkLineOrder/CMakeLists.txt index 78455e9712..b4c8876f28 100644 --- a/Tests/LinkLineOrder/CMakeLists.txt +++ b/Tests/LinkLineOrder/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.10) project( LinkLineOrder ) # This tests ensures that the order of libraries are preserved when diff --git a/Tests/PreOrder/CMakeLists.txt b/Tests/PreOrder/CMakeLists.txt index 8b4c43954b..1fcdf66979 100644 --- a/Tests/PreOrder/CMakeLists.txt +++ b/Tests/PreOrder/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.10) # a simple test case project (PreOrder) set(CMAKE_IGNORE_DEPENDENCIES_ORDERING 1) diff --git a/Tests/RunCMake/XcodeProject/LinkBinariesBuildPhase.cmake b/Tests/RunCMake/XcodeProject/LinkBinariesBuildPhase.cmake index b42e933d67..2fafdab2eb 100644 --- a/Tests/RunCMake/XcodeProject/LinkBinariesBuildPhase.cmake +++ b/Tests/RunCMake/XcodeProject/LinkBinariesBuildPhase.cmake @@ -45,6 +45,7 @@ endforeach() file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/ExternalFrameworks/CMakeLists.txt [[ +cmake_minimum_required(VERSION 3.31) project(ExternalFrameworks) add_library(staticFrameworkExt STATIC func6.c) add_library(sharedFrameworkExt SHARED func7.c) diff --git a/Tests/SBCS/CMakeLists.txt b/Tests/SBCS/CMakeLists.txt index b3c3c2cfcb..12905d8135 100644 --- a/Tests/SBCS/CMakeLists.txt +++ b/Tests/SBCS/CMakeLists.txt @@ -1,4 +1,4 @@ -# a SBCS test case +cmake_minimum_required(VERSION 3.10) project (SBCS) add_definitions(-D_SBCS) diff --git a/Tests/VSExternalInclude/Lib1/CMakeLists.txt b/Tests/VSExternalInclude/Lib1/CMakeLists.txt index 9dfac8616e..333acd1c3b 100644 --- a/Tests/VSExternalInclude/Lib1/CMakeLists.txt +++ b/Tests/VSExternalInclude/Lib1/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.10) set(CMAKE_SUPPRESS_REGENERATION 1) project(LIB1) diff --git a/Tests/VSExternalInclude/Lib2/CMakeLists.txt b/Tests/VSExternalInclude/Lib2/CMakeLists.txt index f4513548dd..9d5ce108a4 100644 --- a/Tests/VSExternalInclude/Lib2/CMakeLists.txt +++ b/Tests/VSExternalInclude/Lib2/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.10) set(CMAKE_SUPPRESS_REGENERATION 1) project(VSEXTERNAL_LIB2) From bc77fb0d5517df886ba97e74bae15bdd709fc494 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Nov 2024 11:44:32 -0500 Subject: [PATCH 06/14] Tests/CMakeLib: Use more recent policies --- Tests/CMakeLib/testDebuggerVariablesHelper.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tests/CMakeLib/testDebuggerVariablesHelper.cxx b/Tests/CMakeLib/testDebuggerVariablesHelper.cxx index 5fe1c634fc..e3dbbceaff 100644 --- a/Tests/CMakeLib/testDebuggerVariablesHelper.cxx +++ b/Tests/CMakeLib/testDebuggerVariablesHelper.cxx @@ -74,9 +74,9 @@ static bool testCreateFromPolicyMap() std::make_shared(); cmPolicies::PolicyMap policyMap; - policyMap.Set(cmPolicies::CMP0000, cmPolicies::NEW); - policyMap.Set(cmPolicies::CMP0003, cmPolicies::WARN); - policyMap.Set(cmPolicies::CMP0005, cmPolicies::OLD); + policyMap.Set(cmPolicies::CMP0178, cmPolicies::NEW); + policyMap.Set(cmPolicies::CMP0179, cmPolicies::WARN); + policyMap.Set(cmPolicies::CMP0180, cmPolicies::OLD); auto vars = cmDebugger::cmDebuggerVariablesHelper::Create( variablesManager, "Locals", true, policyMap); @@ -84,9 +84,9 @@ static bool testCreateFromPolicyMap() variablesManager->HandleVariablesRequest( CreateVariablesRequest(vars->GetId())); ASSERT_TRUE(variables.size() == 3); - ASSERT_VARIABLE(variables[0], "CMP0000", "NEW", "string"); - ASSERT_VARIABLE(variables[1], "CMP0003", "WARN", "string"); - ASSERT_VARIABLE(variables[2], "CMP0005", "OLD", "string"); + ASSERT_VARIABLE(variables[0], "CMP0178", "NEW", "string"); + ASSERT_VARIABLE(variables[1], "CMP0179", "WARN", "string"); + ASSERT_VARIABLE(variables[2], "CMP0180", "OLD", "string"); return true; } From 0d416ad57f8756ea04353c9d8424189771d12582 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Nov 2024 11:24:32 -0500 Subject: [PATCH 07/14] Tests/PolicyScope: Use more recent policies --- Tests/PolicyScope/Bar.cmake | 6 +-- Tests/PolicyScope/CMakeLists.txt | 92 ++++++++++++++++---------------- Tests/PolicyScope/FindFoo.cmake | 4 +- 3 files changed, 50 insertions(+), 52 deletions(-) diff --git a/Tests/PolicyScope/Bar.cmake b/Tests/PolicyScope/Bar.cmake index 5202cb5e12..f15124f78a 100644 --- a/Tests/PolicyScope/Bar.cmake +++ b/Tests/PolicyScope/Bar.cmake @@ -1,8 +1,8 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.31) # Make sure a policy set differently by our includer is now correct. -cmake_policy(GET CMP0003 cmp) -check(CMP0003 "NEW" "${cmp}") +cmake_policy(GET CMP0180 cmp) +check(CMP0180 "NEW" "${cmp}") # Test allowing the top-level file to not have cmake_minimum_required. cmake_policy(SET CMP0000 OLD) diff --git a/Tests/PolicyScope/CMakeLists.txt b/Tests/PolicyScope/CMakeLists.txt index 353842bc48..36ba01a7fb 100644 --- a/Tests/PolicyScope/CMakeLists.txt +++ b/Tests/PolicyScope/CMakeLists.txt @@ -12,9 +12,7 @@ endfunction() #----------------------------------------------------------------------------- # Test using a development framework that sets policies for us. -# Policy CMP0011 should not be set at this point. -cmake_policy(GET CMP0011 cmp) -check(CMP0011 "" "${cmp}") +cmake_policy(SET CMP0011 OLD) # Put the test modules in the search path. list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) @@ -23,22 +21,22 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) find_package(Foo) # Check policies set by the package. -cmake_policy(GET CMP0003 cmp) -check(CMP0003 "OLD" "${cmp}") -cmake_policy(GET CMP0002 cmp) -check(CMP0002 "NEW" "${cmp}") +cmake_policy(GET CMP0180 cmp) +check(CMP0180 "OLD" "${cmp}") +cmake_policy(GET CMP0179 cmp) +check(CMP0179 "NEW" "${cmp}") cmake_policy(GET CMP0011 cmp) check(CMP0011 "NEW" "${cmp}") # Make sure an included file cannot change policies. include(Bar) -cmake_policy(GET CMP0003 cmp) -check(CMP0003 "OLD" "${cmp}") +cmake_policy(GET CMP0180 cmp) +check(CMP0180 "OLD" "${cmp}") # Allow the included file to change policies. include(Bar NO_POLICY_SCOPE) -cmake_policy(GET CMP0003 cmp) -check(CMP0003 "NEW" "${cmp}") +cmake_policy(GET CMP0180 cmp) +check(CMP0180 "NEW" "${cmp}") #----------------------------------------------------------------------------- # Test function and macro policy recording. @@ -46,65 +44,65 @@ check(CMP0003 "NEW" "${cmp}") # Create the functions in an isolated scope in which we change policies. cmake_policy(PUSH) if(1) - # Change CMP0002 - cmake_policy(SET CMP0002 OLD) + # Change CMP0179 + cmake_policy(SET CMP0179 OLD) function(func1) - # CMP0002 should be changed when this function is invoked - cmake_policy(GET CMP0002 cmp) - check(CMP0002 "OLD" "${cmp}") + # CMP0179 should be changed when this function is invoked + cmake_policy(GET CMP0179 cmp) + check(CMP0179 "OLD" "${cmp}") # The undocumented PARENT_SCOPE option sees the caller's setting. - cmake_policy(GET CMP0002 cmp PARENT_SCOPE) - check(CMP0002 "NEW" "${cmp}") + cmake_policy(GET CMP0179 cmp PARENT_SCOPE) + check(CMP0179 "NEW" "${cmp}") endfunction() - # Unset CMP0002 - cmake_policy(VERSION 2.4) + # Unset CMP0179 + cmake_policy(VERSION 3.30) macro(macro1) - # CMP0002 should be unset when this macro is invoked - cmake_policy(GET CMP0002 cmp) - check(CMP0002 "" "${cmp}") + # CMP0179 should be unset when this macro is invoked + cmake_policy(GET CMP0179 cmp) + check(CMP0179 "" "${cmp}") # The undocumented PARENT_SCOPE option sees the caller's setting. - cmake_policy(GET CMP0002 cmp PARENT_SCOPE) - check(CMP0002 "NEW" "${cmp}") + cmake_policy(GET CMP0179 cmp PARENT_SCOPE) + check(CMP0179 "NEW" "${cmp}") # Setting the policy should work here and also in the caller. - cmake_policy(SET CMP0002 OLD) - cmake_policy(GET CMP0002 cmp) - check(CMP0002 "OLD" "${cmp}") + cmake_policy(SET CMP0179 OLD) + cmake_policy(GET CMP0179 cmp) + check(CMP0179 "OLD" "${cmp}") endmacro() endif() cmake_policy(POP) -# CMP0002 should still be NEW in this context. -cmake_policy(GET CMP0002 cmp) -check(CMP0002 "NEW" "${cmp}") +# CMP0179 should still be NEW in this context. +cmake_policy(GET CMP0179 cmp) +check(CMP0179 "NEW" "${cmp}") # Check the recorded policies func1() macro1() -# The macro should have changed CMP0002. -cmake_policy(GET CMP0002 cmp) -check(CMP0002 "OLD" "${cmp}") +# The macro should have changed CMP0179. +cmake_policy(GET CMP0179 cmp) +check(CMP0179 "OLD" "${cmp}") #----------------------------------------------------------------------------- # Test CMAKE_POLICY_DEFAULT_CMP variable. cmake_policy(PUSH) - set(CMAKE_POLICY_DEFAULT_CMP0010 OLD) # ignored - set(CMAKE_POLICY_DEFAULT_CMP0012 OLD) # honored - set(CMAKE_POLICY_DEFAULT_CMP0013 NEW) # honored - set(CMAKE_POLICY_DEFAULT_CMP0014 "") # noop - cmake_policy(VERSION 2.6.3) - cmake_policy(GET CMP0010 cmp) - check(CMP0010 "NEW" "${cmp}") - cmake_policy(GET CMP0012 cmp) - check(CMP0012 "OLD" "${cmp}") - cmake_policy(GET CMP0013 cmp) - check(CMP0013 "NEW" "${cmp}") - cmake_policy(GET CMP0014 cmp) - check(CMP0014 "" "${cmp}") + set(CMAKE_POLICY_DEFAULT_CMP0170 OLD) # ignored + set(CMAKE_POLICY_DEFAULT_CMP0171 OLD) # honored + set(CMAKE_POLICY_DEFAULT_CMP0172 NEW) # honored + set(CMAKE_POLICY_DEFAULT_CMP0173 "") # noop + cmake_policy(VERSION 3.30) + cmake_policy(GET CMP0170 cmp) + check(CMP0170 "NEW" "${cmp}") + cmake_policy(GET CMP0171 cmp) + check(CMP0171 "OLD" "${cmp}") + cmake_policy(GET CMP0172 cmp) + check(CMP0172 "NEW" "${cmp}") + cmake_policy(GET CMP0173 cmp) + check(CMP0173 "" "${cmp}") cmake_policy(POP) #----------------------------------------------------------------------------- diff --git a/Tests/PolicyScope/FindFoo.cmake b/Tests/PolicyScope/FindFoo.cmake index e364b6d95e..843c650714 100644 --- a/Tests/PolicyScope/FindFoo.cmake +++ b/Tests/PolicyScope/FindFoo.cmake @@ -1,2 +1,2 @@ -cmake_minimum_required(VERSION 3.10) -cmake_policy(SET CMP0003 OLD) +cmake_minimum_required(VERSION 3.31) +cmake_policy(SET CMP0180 OLD) From cde63efaea0ba65bedd0dc270a0876d221a14e45 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 15 Nov 2024 18:36:58 -0500 Subject: [PATCH 08/14] Tests/ExternalProject: Update sample projects to require CMake 3.31 --- Tests/ExternalProject/CMakeLists.txt | 34 +++++++++--------- Tests/ExternalProject/cvsrepo.tgz | Bin 1317 -> 1462 bytes Tests/ExternalProject/gitrepo-sub-rec.tgz | Bin 2086 -> 2202 bytes Tests/ExternalProject/gitrepo-sub.tgz | Bin 2229 -> 2329 bytes Tests/ExternalProject/gitrepo.bash | 7 ++-- Tests/ExternalProject/gitrepo.tgz | Bin 1817 -> 1903 bytes Tests/ExternalProject/hgrepo.tgz | Bin 2011 -> 2711 bytes Tests/ExternalProject/svnrepo.tgz | Bin 3673 -> 3936 bytes Tests/ExternalProjectLocal/CMakeLists.txt | 8 ++--- Tests/ExternalProjectLocal/Step1.tar | Bin 5632 -> 10240 bytes Tests/ExternalProjectLocal/Step1.tar.bz2 | Bin 904 -> 898 bytes Tests/ExternalProjectLocal/Step1.tgz | Bin 791 -> 820 bytes Tests/ExternalProjectLocal/Step1.zip | Bin 1074 -> 1370 bytes Tests/ExternalProjectLocal/Step1NoDir.tar | Bin 5120 -> 10240 bytes Tests/ExternalProjectLocal/Step1NoDir.tar.bz2 | Bin 852 -> 846 bytes Tests/ExternalProjectLocal/Step1NoDir.tgz | Bin 770 -> 785 bytes Tests/ExternalProjectLocal/Step1NoDir.zip | Bin 1038 -> 1194 bytes .../ExternalProjectLocal/Step5/CMakeLists.txt | 2 +- .../ExternalProjectUpdateTest.cmake | 18 +++++----- Tests/ExternalProjectUpdate/gitrepo.tgz | Bin 3397 -> 3550 bytes 20 files changed, 36 insertions(+), 33 deletions(-) diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt index 3d0067319c..12081522ac 100644 --- a/Tests/ExternalProject/CMakeLists.txt +++ b/Tests/ExternalProject/CMakeLists.txt @@ -168,7 +168,7 @@ if(EP_TEST_CVS) ExternalProject_Add(${proj} SOURCE_DIR ${local_cvs_repo} URL ${CMAKE_CURRENT_SOURCE_DIR}/cvsrepo.tgz - URL_MD5 55fc85825ffdd9ed2597123c68b79f7e + URL_MD5 287399370738adfe932e036cbe38d5b0 BUILD_COMMAND "" CONFIGURE_COMMAND "${CVS_EXECUTABLE}" --version INSTALL_COMMAND "" @@ -190,11 +190,11 @@ if(EP_TEST_CVS) # CVS by date stamp: # - set(proj TutorialStep1-CVS-20090626) + set(proj TutorialStep1-CVS-20241115) ExternalProject_Add(${proj} CVS_REPOSITORY ":local:${local_cvs_repo}" CVS_MODULE "TutorialStep1" - CVS_TAG "-D2009-06-26 16:50:00 UTC" + CVS_TAG "-D2024-11-15 23:11:00 UTC" UPDATE_COMMAND "" CMAKE_GENERATOR "${CMAKE_GENERATOR}" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= @@ -229,7 +229,7 @@ if(EP_TEST_CVS) INSTALL_COMMAND "" DEPENDS "SetupLocalCVSRepository" DEPENDS "EmptyNoOpProject" - DEPENDS "TutorialStep1-CVS-20090626" + DEPENDS "TutorialStep1-CVS-20241115" DEPENDS "TutorialStep1-CVS-testtag1" ) set_property(TARGET ${proj} PROPERTY FOLDER "CVS") @@ -248,7 +248,7 @@ if(EP_TEST_SVN) ExternalProject_Add(${proj} SOURCE_DIR ${local_svn_repo} URL ${CMAKE_CURRENT_SOURCE_DIR}/svnrepo.tgz - URL_MD5 2f468be4ed1fa96377fca0cc830819c4 + URL_MD5 0d75c80611c998e36c36f4a9e1e739d0 BUILD_COMMAND "" CONFIGURE_COMMAND "${Subversion_SVN_EXECUTABLE}" --version INSTALL_COMMAND "" @@ -258,10 +258,10 @@ if(EP_TEST_SVN) # SVN by date stamp: # - set(proj TutorialStep1-SVN-20090626) + set(proj TutorialStep1-SVN-20241115) ExternalProject_Add(${proj} SVN_REPOSITORY "${local_svn_repo_url}" - SVN_REVISION "-r{2009-06-26 16:50:00 +0000}" + SVN_REVISION "-r{2024-11-15 23:23:00 +0000}" UPDATE_COMMAND "" CMAKE_GENERATOR "${CMAKE_GENERATOR}" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= @@ -272,10 +272,10 @@ if(EP_TEST_SVN) # SVN by revision number: # - set(proj TutorialStep1-SVN-r2) + set(proj TutorialStep1-SVN-r3) ExternalProject_Add(${proj} SVN_REPOSITORY "${local_svn_repo_url}" - SVN_REVISION "-r2" + SVN_REVISION "-r3" UPDATE_COMMAND "" CMAKE_GENERATOR "${CMAKE_GENERATOR}" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= @@ -320,7 +320,7 @@ if(EP_TEST_GIT) set(proj TutorialStep1-GIT-byhash) ExternalProject_Add(${proj} GIT_REPOSITORY "${local_git_repo}" - GIT_TAG 57418671a0a0e371e7bac532337152595fbe0df5 # generated by gitrepo.bash + GIT_TAG 4ed00009457732fc8b6d75f6159bbc384119c3d1 # generated by gitrepo.bash UPDATE_COMMAND "" CMAKE_GENERATOR "${CMAKE_GENERATOR}" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= @@ -568,7 +568,7 @@ if(EP_TEST_HG) set(proj TutorialStep1-HG-byhash) ExternalProject_Add(${proj} HG_REPOSITORY "${local_hg_repo}" - HG_TAG dd2ce38a6b8a + HG_TAG fc5a0c915390 UPDATE_COMMAND "" CMAKE_GENERATOR "${CMAKE_GENERATOR}" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= @@ -621,8 +621,8 @@ enable_testing() # BuildTree tests: # if(EP_TEST_CVS) - add_test(TutorialStep1-CVS-20090626-BuildTreeTest - "${binary_base}/TutorialStep1-CVS-20090626/Tutorial" 4) + add_test(TutorialStep1-CVS-20241115-BuildTreeTest + "${binary_base}/TutorialStep1-CVS-20241115/Tutorial" 4) add_test(TutorialStep1-CVS-testtag1-BuildTreeTest "${binary_base}/TutorialStep1-CVS-testtag1/Tutorial" 64) @@ -632,11 +632,11 @@ if(EP_TEST_CVS) endif() if(EP_TEST_SVN) - add_test(TutorialStep1-SVN-20090626-BuildTreeTest - "${binary_base}/TutorialStep1-SVN-20090626/Tutorial" 100) + add_test(TutorialStep1-SVN-20241115-BuildTreeTest + "${binary_base}/TutorialStep1-SVN-20241115/Tutorial" 100) - add_test(TutorialStep1-SVN-r2-BuildTreeTest - "${binary_base}/TutorialStep1-SVN-r2/Tutorial" 99) + add_test(TutorialStep1-SVN-r3-BuildTreeTest + "${binary_base}/TutorialStep1-SVN-r3/Tutorial" 99) add_test(TutorialStep1-SVN-trunk-BuildTreeTest "${binary_base}/TutorialStep1-SVN-trunk/Tutorial" 98) diff --git a/Tests/ExternalProject/cvsrepo.tgz b/Tests/ExternalProject/cvsrepo.tgz index baba6d3c2e0c3df1f4b5e1521e84e9c352242030..25bb7c3e812f9d4f9ed23057e5149b0e87e15acd 100644 GIT binary patch literal 1462 zcmV;n1xflJiwFP!000001MOH_Z`(E$&a3$=h-3krB9ld3(YhO)rrDaJNeageHf)7K zOSG+3w}_PMpy_`54k^j8U8hdh#NAMx2U{l3jXFHvN7|e4jHO9y>j6avacx_E6W7+~ zzbn}y#4vPMcWl$#(h0G3YYW>CnN%e?7c|3o>s=6!2A|PeH~&8sudM&!#d-JatoI=M zK-J$}Q-8}Pwrd-vL!kbK17CIhHz3RP_mX%RjP5svEU;x+x7Xj8^}p+yvi_EC7+YAs z-!xXscV7Qj$>>GEMUq|p)H^xoqHmo~Et{3){-4nBM?pvYK4Yxye`1#X4-`No|67J@ z)&0K-5sV9{H^EnR>wk~3-2dZ(4DL0CY;niAz5j{jES>)>Q+MkA--MhvuIc*LkX)+; zUjN-Xxx%lrWR%f}w|+hDwGL0{JJ#v}PVm;zRIn_jAt?OCJkb(S+Ipm4_j1@X0S(Uu zOUX6S%xh)z3icA$#8lMK@}HHe{})Pl&$qxk-T#aJw}@dY{Wk+;1Ln;d|2H9HM*RlSNE=blW1P1UzlsJ)$Wfy@8a`3eVdA~x zZOla$c%qHGB#Kxp8l4^7X(NO{2l-U6hN0_^HQmt+TO*ccxtig$8#EW=B*W5U@z`#_ zlVJF0nzqp(qp>$;5Ibg5(I}h;BJdmWZ~Ciq+MP~=^mQ`q2^q;}+(VsC88b{qsB?7s z;t4*E!GwkwJb6$oED|in3`5>9SZ!#m_BWPWo(J-vgNHIN&{K?smk3T}tf3APkQnN; zT1vI}k0j5SkCRjcNz5^geax8gO_Jr-07^I zfCb)ed3<_{rJRtjrgLY;UETkS^!*jBuVhXC8;>_PER8^G+L~c%MAt0xh5b)7V-5lc+#TSE`rP`3SkK(Y@@~+U;fzn=#)ep$Zhdh$ zG8Zn%PxG!}M=viqdr=_Hw}CdZfHp6JPJDvjq%s2>1#uAN5#ZNl9!UI|u#5u$Nw70D zlgyB62kqb<+~sgtCro`G)FmcDq7_DtaFPo=xWdXgq#dPTC$S9bj$;}zEP+%)-h|JA zrlx7Qx!^vD!z*c;ri^A>S``+PfGd22dMUpl1j@jC5A7hew0^my{%lFj63x_t_E1_P zakE0GJ*3vgW^0f0XaG(T;O~vr63l|5Tc#D3>dNU1*D=MiFIa|$LCEA=ODX4=C-6d& z;T&C5kPpTs-S8yOJV_BgLo+adhqr+bR{OnEl@TmX%xchO{d24%7 z``Pj7LHGC7+EP_50E(=V7z8l|Y7-e_v%H`#-Wb*)#)_YU*b8%?sRhdPxm2S9zi0S; z5QZ=g)mjdON~^vPmGa~q5^enR;!qe27RMq$>xGf+PoW<$S>TAmdYkfzW+QJOUIFasNANuPfLLvOydowBRKXzHpRP>X_S#mi;Rgpi!mvFeS}Z21V#a7gGyY`FlYEDOhqzm zDnn8jmP!z0PK#e=qIqMd6qhsVeOlPv5r!ks?r7;9-8kBxkE6VnS?g`|@e3|#wbW8e QEe|07007h{=m01H0IEyuasU7T literal 1317 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 literal 2229 zcmV;m2uk-KiwFP!000001MQp(R1;Sk$0zbAq==6`+|oraf`XNV%qtTRL>lCAP(c?C zdKBvs7xs0zg(fcM6i5#z9PBntqPZMGS8_qeXR^S@AxBK`G@jW!!yYeNv2 zm-epu!z$zs{V`sDOsEDx<=U^|oF`oWsd|Q`vgE!(C9s=0hMi3_td-F=(hdGVNv|YVGNeqe|HcJ1jRe`2DxU=6a{i9%0d|c?XXy8E4n_| z8J6QSxxo+_snPRVk+>m}g!L$?hV>d;PhxN+VZe17g4SqY3IW3NB1{x%ut!))J4dln znD}`j_J0Fq*R$pvj*tB=v(c^p!?39R#}NXR{NEj9*leVgckLhhf1?0pFmr%2ne9O6 z_<_(n>O?5u7$DripQrA)Nh$gFFB7re2Yg2@O6sjWxrqIr(aogvoNFUM&*y(JOpQzJzdN{_{=%rxRh6LU z`s0`imGpN9_td|0YCx?)F$7a1dRRx3FhUz}48>55My*5Dc%>lwSMUbEBk6;8U&HuQCmy^@SLo&#VFUm|Y<-{+vA8# zO1D!VDY+zhh?3_6B(I-KBJ@pHqqGt8-%rbHSO8l5^V7NcuT{qyLVh3lRBcN8Dcyyv z*6QZf8ONH5y7>Q`bi72I&#Wo9xXd&tBk!bF?fKH3bbHG#zs9+Pbh&{c9oYFb%bt~I zt^IWrd3ajI3;9!j+p(~%udIb${oLS~w~3ABBc&JO3mO7m=3nK9e6{3rsE|+B`Q+!U zAM(nmd0P^$|F`^f>7E%SU+oB!KFtmEwxR_=dnSC>_uGpxgR8ys%21&ez!OiVG=?8Jo;u=q zvVyMt=z}l5E3G!C*4Vy?d?k2Yy0Yr>p}PL>96L?Gqgq0@*H%ofsd#7chMCp*g$-EB zwZP9(YeLR1|M2~5&8O0y@c?OuDOKvej+TZg`{(J${N-Kmf~vVYgN9v&j*{4^`@f z4C}H@0nopahhMIZ&MVtEX*{z?^{ajV9vRTKVS0#dbD;0@!+tYaKA~g{?(^K9i8(t$ zh8Nw)A3Fd(NUnUEIr_<^q9xHCn-*^`{l}t`vg^-=Zyqo=v2}aaQ_=krBVPY(bmKl# zSWuMb-1R4im5i!sh3XwA%l}OI7OY!tHMYsBZ)Be+&Ww-FT{u4eWA*5-551WjbF5iW zgqPFox;Iutrs$hI+Fx(-tX^(f`vq3zkFk11hzrr*8`{ zNIAQH)pe$?rcd9E2NHtbdMhADQ58L`a`Ewgb+ar(iWgGHqEE>u?=3EVG5*`+5$Eb7 z{UXHn_9VY)I~z4-ZF0GC zL&e1QWy2Tk8j$IIqkh^qe=Lv7SERr3QB<8)cIH?tz4sFiKYwmXtim7u+ZHdO%Aio6 zf@#_%IrX~^dObaO(C7<}Q-^C+VaU88-)Cwo-y1M}ivGQA(7-hz%DW73pJeXV{+n$y z^C;*4r1f9!;hy^I8LQRIDU2+cV|oZ1-H!iNqVYdW5Qy~mKewPwOiPlCCEyb=-;z00GXJGz~mjqjb!4G0ZIS7YHhqu-d~oh4UZ zcy;N!#=#t3%Le{aQ!*o9N-w@IiEg-O{1-;_E?5TM?fM_JS``1)7$(Jkw~z*UKFK4O zmIpmHi2c8FDVU3G^nCp%N(l3R()h3UajHK@8eLfl9$@`1flA|lx8PL&n@d4mX5#_o ze^kQyUrGPoN36dq=lyQcbNx|5E$QzToa#^I=`9We{ z2y@4jjk7EHD-#$NkRXR;gs~;CGIq`~8<=fC8{WB%jAkqrCYOJ|AeV7i3_wTmR~s3| z0PGY87@B`VmsNhS!f_O9vx6{)t;>S&2rDqtU^e3bxukG_0SP~h8Bv~Arhp{unT0}u(gH2gLOUR6 zDRqXPf8Y1s%hn+%66X~y4nY};L85I{xih63@)3L^o4%oaQj+dmu^ZvTH2M}Yrr663KuIa%+9@bCRkqBIKq zZv=ts^H4fA0Tj9uMQ@SfDimSx`i& zd<5WFK>>8UJbX ze{lR4eLDF6LWtMZMg;T!1f2gdh7SH$7>C}SKm`8BQMmqN2!a038JC$I4I5#{e>fey z{!456hxuRhQ8k|q;MneeOQ8Nmn>IhEe+n2u{znre?Ej6RGyi)T`)oZMK?L#NO2Pc! z5JLK2dod3uQJ!N7o}hS^K`9KyIgDmFmM824L*O{Uk*pOb35#}gNE@1iNiuZ&x6(oW z$4Lx_>pzAtB{SveXw*ZE31xKz ziJ}Bn;60VMH~-}BA(la(+_`!nbLRJ>D?K|8?jBly98cM?a(&U7y|ZSB-3zMkUHnqf zqUT>;QrDxUVM+C_FVoL0+TL6{Z>OuEVnSchx$AJsiP60f#~q;QtsZ4{)1F&z+KS#V z?)2OpH}|XA^2~`I6aScJs~vNHaaK6<5AlYSP?Dyi2N0!QPqH&2$Psytov+38^qWBT{P4!2s#?EP3+dB2pw_j;_t*EK+kG8wMKq}+DX^pEtl##SC zrmSvHp4pN=Y4XS2ljkHQ_Pjf1ZO&fv`?()~8;iK6cgL!FwT-6!TwW0S)q`!vx2?E+ zRGuwMFaPVLe~Eh_w2g53$51jz{{(HNq5h4aFgJUKx`_!WT3-;S?dz=FVWUpHSa(lF zW2Ni1nQ!$uGjnc2{esJQ`;bdSC;i(5#m#s_*a)Y80<#9kf0BahKZYu!8$Me!K6zQn$Qx&kym@);(bILeB9N%k zS^U@gIe(jTIPChbHE8^&)-Vd@e?~9`{QHT16I>p?Y6z)+ z?db|ZF*_v2>%2r8VaI=X(EKk(tNWq;jUa2nl$@BDcw};J_IUqC*=l{#g=&0uR(9r8 ze|^S;>`dHWpL_8N@sAjDr&lFi8DGKz%N1R^I!@Hq2mEUU@eca)X05W}S$=z5Ro}<% zE0(8|pAWIrHa*cFffz<${MT|jjy3E41Yo%QAEP?_{|^#{>%WGOdLjSUe187<-E`pP pI2XqP-sf_aoBeNOQBu^6sjE*5!e5j^AP~rv&R^esnJ)lP000L(%MAbk literal 1817 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 diff --git a/Tests/ExternalProject/svnrepo.tgz b/Tests/ExternalProject/svnrepo.tgz index b8484165e00896cb85d3638942934fa63b333d11..da5350f91307dce9843cd467d6e69d907e5ebe1c 100644 GIT binary patch literal 3936 zcmV-m51;TKiwFP!000001MOY^bKA&ucP5#12K^!FOn&H0CY>!6$MQuavG}q8bmz|L zOrESeOIBoC)8u-iF0cy`F$wVSMPHKM%z-+4l1!(~PyMBx{@8z_{p0#}0Z=4Gn`fEg zU2Hr_CIRf1x4ZAX&)c`VaB>pHd>FNF-5{wzmT8JlY?v##igb&f|AkUgj=vX${!IzN>yN)?n7AJQRnXM<4{4H|vZdD{ z2ACMeOUK_J*39_pmJ0f>E}fG(^p21J+S(d=(hCyg2Yrs!L7)@OfICWg|;A3FFFlT5JD0z%c$yd zc|STuL5d)0N`o*#QOHrky)=kI)Ti*g&l&nGg94M!i~67RI11^21J7)NS>TgXuZKiZ zxavc}8?rR&c~KUoXbAWFK?to-)~XWWTaU)^Il5PTCQx{pVjSed)Ssn zQ~EzOUdyXvf&ObMAv5}KV#})ae-$*X|3dlVsGkV+6c>JQoW)eCAgHsrS&0Z@lnFk`x93Y7lak1ZfnXw-8$2k@-L`LAhjdSwxkk7f0D~ z5B1V?xGB`T4N5II+(b_g9wr-tm9Qwav|BQF5XZdFPiUC7?ke)mVE{E2#kAW==AMAA zLu*=Ta2y9oD~gZX(qIgt7)l8XYbFv%({Ri~9@GBkm9>HPMMLp8sd{RvjeMesveYc3 zncy@HJeqP=v=D67)Lm((66lgc+7B2yq5X`583ukDr*V+-#s+G{oU+EoIDaDqbJl!%4=OvoCA&644JNR%mV0xy?0WsPIwTG`YlbIXQL zOGrQRri7zPFAHEar7ndo6C(t?J`MY#4l(G-kb8j-;|@8}9ugWTct@uJTv606S}IBu zdG92b6-hDb!*`Itvd@K>A{N8|6+*OR)~BHt4F=G~1)E^&%Wi=@LP{rkW*X&0H%+$s zUU9{gv7VIuP&6UnMMq2wsCWon+aFY&G9mT_YQpW)=<>EGqeo8)rVlfTi=NY%6>h=vODJOx)kq~-XN=wyhS!kg&lbQ*Aon-+N-B2{*9@;%e9|v)gqJwd& zw+H^-d8+UqH0)V&LleMj%>RgP)$_kq(De8-wkl#UZGU@|#RQa%7DX{%qkKvA5aW)ry)K)7%%AiYE& z=}{EVt^nelMEQuv&%kFpN5BXVPl7lK3*4s9z}d=DKs<0|*d#Nh(u6LJ$P%wIPy5lVmSqlvv8y2w0!JEj7ydh z$rB9~e&+SFM7SZco@vIC2%Ums0#j)h;8~O!Msfzq`-yZ`At!Wj!32V8tE;L)=-FQj zKS`oJ3OU>>@jgPFfk!)T>t(gAYoYS2{x|#4ak6A1urU5(%*KCA)i7)QUj<41KTfW1 z1Z4Ko62Mn9pkXk~z(p4Z;aVC$ty^Wjfci68Kd@p7YER0T3FFF-got{Ji14k>4vtfGa4_(Gil$`=h#-Se6 zU~c1by?~;ZAj^g#>Kf29YdSifCI9io)8RkB;s?+WUBCyCG5yXbQfi zSg45k7a7zl3X_-y<;4j25@2%u2;;Xs^pYz5FZjBdItm}}<@&Fx+N}MzwA%k$3F+Sr zF|6rZqOt$y-rN?TZ{+_O7B($YHvsrS|8c$lXEii2{%K6Zgvtf?pA6$@xcpUsYmC3D*5khtnm7K-_PZ9%|5P&T{~4;-|5y8eH&34;TLBr^WHjZ< zA<`^GQ&p#_lBPzUV6thLn+9&#FkrU!8>PF~sr|*bistD*UUD6a^j`yPDD|JHh9>pj zAhrIlf<8r9l?Fg;I*DR10dSpi=#=7mp?z>Rb<(m8hnV_rAhjh^_oHJ-Z0TSy9&DnW zFh~R1M`BM-AUB3S$;8GNxb-;YLoDMXA{ujlSF8ba&r%+Tw7(xmzvW(v1UIeP^xO>1 z(|>)*bu83>O}pa%kvjgf61tB5Yeo~}CN`gF`X+WZP2AEf_#w0UZxF>BfJSekr$dn+ z4T3NjWCK*jQ(3j3D59-;OUJd6ubk%TzqaH$7U{pPjrV^O9oPQ;Kr)YWu$m z+JCsUvnOpP{2g@nm4Iy`wWYRVwT&$$Js*Pm#)4RpN9W)XfWw*igdYQbG^RP0#jxiP z->@y}a)V+HJ|bhP?iyV2#1W58)K(M)TL3OrZJfVLG^_v1j{OK)p#O&08!#RJ0sXK2 zzm-s@`|!z@^7wEMzUQ}p{Hy=ndGF7MALO6uqr?49{= zaH^n=vc|X{g#75Rd+>PY(caPS)+dh+(1#!H?0u+IW@fV9uXhKdzx!%`@7~4U?$^7! z|J})d@?V|2@uyBs{->MoKFEL9&0C|rJbRFT@8AA;q`Y{V@BVR{bn7&?B@sh!P*}l_ThT@Yi;&lDV?PIYA?Dp}7`o8kz+#&j@H(LMdSD*ee-~QV_ z{^Q<@F8RMsey5Y$|GJa^IPd0b|M{Q=AAj>=FCV@*9Q~j(`dOD;bn{1l>gK=b=KKHA z%^RJ3C-02>Kktu}e0%gSFFNYQ;pp%4-O>PaAzTfJ#g0S(? z&feC+uPI}05K=LJi8-gS*DDS^3XLh{C;`Dc<>)l%_kkHuE9FRTa^uN*gP(CPODT+? z0wo=xwB?Sbd!-FjtXu?CKeN|0$g$nbTaGl%QG z>YBuIz<&Y%#`GAK5c_oJP%^GTy4K=J+kE*FVMML4!vQ&$C#86$A zXcl&Xcf1MXKgx10kiO%#)SNGJ$5!Q=8lQ7-kT(y0d__j}|!(7kzIrlV7JIuuN|G(_DA3+QJe=sq#>pwas_5S~rkaY5pCNQ69g|qkk zz30DFesC*q-}?I2#aXV2m6=(*(c1=@M4Q6M$VVF3CbP0KT4`l;s6aCjv32Aau0;f} zazGN7yEY@H%E91J+j5D^uVN4Ut{!}h3Gk7vT_N=7ZQUVPOgJuj*VOH+y{nlTUYHi-kILn| zYB|p9aZhxPJiB{!K@KvPOL-t_lLxw5EttSh7F)auYB+>RvN(|?UcDxBR7--8XALthZ;5t*MjE1)W;mvmN3(5D^9W;Ld<>OQAAdJyLgoY*742Oi z8WoT;7mdn!$d&%p9Wg1=@U`#=*hMzE>GN3=_W#C? z0G2`i*Es*DgK*ULe-(t^F@L9~X`0Y~@#41|sbk^!55t_*e@Id5|0>ARH63PGS`#3R zHB|$vO&7bo>1fO}Jk#_oLTeN8_R@s@%Qtm3zlHa|saM|r0%BO>|4L|L{JkuWVIH>p zIu?&VnT`LN_4^-ILpm~1?E}8MG&%oEnqqpq{5lrv{}unw!1ejRm5`tKNv;0xE>-&9 ui=yws`=5ze3l{HxHtPTXr>2@}s;Q=$YO1NGnrft3BWVn(q1sEJSV;reYnonTKrPyNb}7lQP5~ zaXuQ?rGQybJ~%?Xz_*wk2Mj^$LF_GNoMx{r-)4fPQ1C=Oi9NPDap)efw4YJNLLVJ6 zWKj>b7z%l-o)1MBVx5rpAVEzS;FJjj-R5_BhcL1q`!UGw#~mAa44$Djh0Y=$G24yM zK-OWmRp~7HAGiOdj=vY4vlBSY{#DhOuzwLR&X0wsQ)&NP<7amQqI%{D;3Mi%&+Ww> z8gYkkCW{|6tx=l1^jWYhvfad1r(EU8l0nYWJ!0)7ylTQM7FAit~F+UIG`4mAmg&+wy*>%v7A4|NQ zn1kDh2U6PU_=j0c=Jz6!4p9Jr@%c4TFAd~=>UJW@MHTWF* zd+@O<#08WvhaT=Rj|H^zNJ>WuKoRnL{B@X*)QF5lpd(t1JsNXPBi8~vVy6y*ge>BKErcb9 z7<++`Kuye{aVG+V#;f|?QpWH#u}I?&ftTS!(PJ(y>d`Pf^aFdzZe@ax&Je(7Ba~w~+$SRGBBYCZ_yR23titqjd&SXF#Lz-{mW-)^on)|=JnadiHDoM!);p-k96R!aOo3lg@^%^uwwpyL7_xH^DKS74@4yX$&a zz`_Ce@^l&4E|`(zMgT4vKJxqsQQKYwkkMfgAP@npZI1Lrz7Vw;pwf7V1NS|!dGH84 zt49xfK);qB1aU7K=EH~BNm@(s)Bx(CiruOV{RKr&$t*5Pyss`jLLLJb!u``Bqx)$_ zGez6rkf5?x+IxSq#1M#zamN+5=w*NEx^~`wHV_t6tDx z|Gzc8BOnmr$@Av_6rARNWK!<`&w>j2cfzIUsQ2^{I5VB*{~-cQ_{|26n2{r?PTT>sNx{51cM^-26M>!kGmGoY=zD{C84bECn3 zwwqg$YcC_YDpv!!h7E}Wf@Kc5C9!mdS5m|t^DF#Q;UBSyX&5%POx;oI2CUOniW!lK zZOckaWs=2HyvwL2NfI^?mW?vnyh=1~|9A?0oMQhf(7^vgsL1Rem-ascYBcZOUy<(Z zY{2K_@>?JMckTV}cRolSD*c_UM)I@cT5V)65Z2H64j50m4K|(l3ip1@cQa^5nzNbX zdTe*6xqWYKb7OaX<@V+_`tZZGjSr>V%@q6nYQ5Y4&6isn*N!*Vzgl1acO&`LzZyy9 zyGEk_r&M7Bv|dgvD)AM=4SsMRJeA0^Z1R` z<9Ckl9KZMV?c;Zw{q3z}JK3K5W-|%kKDm2*3!beW|Ke+qYK12(MV2%0_X65Yla`j> z?Zx@gq42YqZ=(giFS3~wd2zSJ0%^|mtWIn*^g$Teu3v5czT>uFRo|}ULvTY3SG8S{ zB-e{jm%1LBr@@}Jh^#gZ(EITD;NhbM>2nG39n^XB0U`_VnUm8Cppr8Wjr(!5Sh*ac zoh&hP*{)u;|L9c~RtGNcX^9Uk(En#es+L7tka$(&DLI4+Puc=?-)a z(a3iW9%5)d{49v(?_b{IIiSmXi}F?JixXA!w$-2i@}oPyOICmV?H@LtH1+>Ak}Hj* z{@1nSt)!XE{qt58F28)Tk@TMI^ncpuzthx@o5|*P&E&mivh|NNu%$4ztxwL z)&5_eH00x*{%@1@{@uUdKK^uVslQr#Vs+_0+wHoZ+l{-sS>DA)^O>-SRP_Z3H1;X8 zA~c^5H{a|P+2A~Zl`5(#g={yQeRzQn5t0WJ8PwSp$5hkocI1l;G79}J%XjW>tn(vj z`5c$#LO%{HCJuv2yYn!#m3Kei+TOg~ym5c`-sXet8_nIu+V&T<8`XBz^(xobHdeMj zrncR3JsKRLC}4~RRy*DFmkWh=AX1Nqb;83su3>ObSzs4O>c%2FhR6RK=1VQ)Z^Ao5XNT1uHhK z>*@dydeH;D;Y3tda>!6yuq~Vgf)$){#~>k?JT8vrVQr za!b<<6YvY*8_h8ouIq|f5Eo-pdm(wF?2fDR#ROF|K~>|~TGbRY6%?+9Ase=(t8%NQ z69cz^ceU=ASkYUC(xOH|P?fxxVucaib;Bs+n+wknb*$hHOh8GPW>G*WX-X%}m0|JX zEQjJm8X4+gx#9#F8&aITs>|ln5ipF6t}6&D>5rz{ipiKYOWgP#LDfDp){>M6C{)zlgx&EIC36M984k_IG z>g})J|9SG}m&u#(@zR`>9TCXSRDm63`)Di#$lPYuKHsq8XZKr22&R!+0AWx$-R|e7 z0g4-X)hYnEVzcQ{z+MkP65o;ITkoPq)*OKv3)0*~=p*0@wPNH;9bPeNjJZ6*5sprf zUMGkeL^U-vTQEN`V!IaV|`gQmleHQS4~}0K7rDPDBbb*ps=BU z7rwQO);u=?KPLjcD^h8>>qEl#iCoAq;nI8@vB0C9tt`#Mxv2`D{;~(_HKdd5|GX#f zY4*>t{`mf%QRe?=LZ{ldwyff6UB*V8d{P?WYey&9|9R&CPP2c0)@uU)mG(aqdeQi= zk!4b^nxmw|7Fi zp#%y)j0*N21=I_v_`=2ct^v=m{sS~wuK#911^rub5P*H2e;=pfKY7ystGN98FS8(m zG=xikd10ww|KhvfOE2N?zZLv{;qSkd`#-awg8umzzo*j2srpwZzW<>bxWxanAVVPv zF)>+E72RHvRV**HaEmRO#MV?x(;P#mWq5dfsrdab@zumB^dU_Anf`w=|3^sa|7SrZ z_Pf}W+yB&z|I(T4U)7az{WlAm_W6R6N-C+Ol3q$@! r7n{oSe;3{U%kzI1nacBj7v28L^M4na%JY90+y4I#>^>zY0C)fZ!c#_i diff --git a/Tests/ExternalProjectLocal/CMakeLists.txt b/Tests/ExternalProjectLocal/CMakeLists.txt index f9abe11bea..7caefae383 100644 --- a/Tests/ExternalProjectLocal/CMakeLists.txt +++ b/Tests/ExternalProjectLocal/CMakeLists.txt @@ -79,7 +79,7 @@ set_property(TARGET ${proj} PROPERTY FOLDER "Local") set(proj TutorialStep1-LocalTAR) ExternalProject_Add(${proj} URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tar" - URL_MD5 a87c5b47c0201c09ddfe1d5738fdb1e3 + URL_MD5 e3774630066d0df5b9074cb777d72802 LIST_SEPARATOR :: PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/Step1Patch.cmake CMAKE_GENERATOR "${CMAKE_GENERATOR}" @@ -94,7 +94,7 @@ set_property(TARGET ${proj} PROPERTY FOLDER "Local/TAR") set(proj TutorialStep1-LocalNoDirTAR) ExternalProject_Add(${proj} URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tar" - URL_MD5 d09e3d370c5c908fa035c30939ee438e + URL_MD5 a7357d2e8a52cc807957634ea135eb31 LIST_SEPARATOR @@ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= -G ${CMAKE_GENERATOR} -DTEST_LIST:STRING=1@@2@@3 @@ -115,7 +115,7 @@ ExternalProject_Add_Step(${proj} mypatch set(proj TutorialStep1-LocalTGZ) ExternalProject_Add(${proj} URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tgz" - URL_MD5 38c648e817339c356f6be00eeed79bd0 + URL_MD5 c04edffa0520d5468d51ecd13a971828 CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= -G ${CMAKE_GENERATOR} INSTALL_COMMAND "" LOG_BUILD 1 @@ -126,7 +126,7 @@ set_property(TARGET ${proj} PROPERTY FOLDER "Local/TGZ") set(proj TutorialStep1-LocalNoDirTGZ) ExternalProject_Add(${proj} URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tgz" - URL_HASH SHA256=496229e2a5ed620a37c385ad9406004a18026beab8b55dd2c4565d4b7f1d5383 + URL_HASH SHA256=b9aff8a865842b21cb3bc2ec8bed426b46ef560518962a81242c7f2e089c00de CMAKE_GENERATOR "${CMAKE_GENERATOR}" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= INSTALL_COMMAND "" diff --git a/Tests/ExternalProjectLocal/Step1.tar b/Tests/ExternalProjectLocal/Step1.tar index 3711f07fb32155892d64834cd35d2755def21594..e99effbaaaab7003313a7e6bc5ba56d412a13cfb 100644 GIT binary patch delta 408 zcmZqBX$Y8*Vrc*b=H{jhK+4eE)Bu?VNr3=^p^3Snsky1SkvUM_(9podkU_z8vLRy% zZ)tH!Vv&LZLw06fdeTHeX;v^}vLf51NlXy4%}h*?&4k$jGS|?+*aXdNW1uw*3I>GC zW>H`<)-yKTtjuzUc@hUL=bJz;EOU{2VgOMV$5ezU^db-+pNNJhk5dU_EdtF0lk54nSlY3mTlrnVIgDzFyzoJFf}v; Mh88itStP&)03t$OD*ylh diff --git a/Tests/ExternalProjectLocal/Step1.tar.bz2 b/Tests/ExternalProjectLocal/Step1.tar.bz2 index 49b5f23a6bfdaf83829be0ec1e3cc40ef035f96e..3aa9e2a4777f62270425744a183561f36498edea 100644 GIT binary patch literal 898 zcmV-|1AY8LT4*^jL0KkKS&>)nN&o@G|BcPi0DxX~|DS%h-#-8U|LQ;h00AHX00>Y6 zIqRUxHrBziytMu5oB02%;jdV#5_sp&l$Q}T)Ek5dT541)+@ z0x+2jXbGT5keU-y2-L}@(^EqbXaLXv0iXaqLzqn&8X6f4BSRskjQ|*onE=88fJs6$ z)X_anG{niE$)Toz10VosWB>!k9{;D~XK2v%6$WD(5bgw#&E2kxK+>fXWErO*s2RlC zX(b99U(L*1FdV<;`6s*+=DTKC;2!6cw@-F=n53HH326pGN^md%=mrqZ!#1>5S0ya1 z*RLeo>-eY1i5462#dZ=hJ!%ri+NSH3BPi~BcI{K>n{VyJNJ+vLPeP-pfJJq=5riRf zI(bOqD`7kzI|*@%p_I+fqKQ2Kx(Zv&hGV`FuY^MDW0iO~_>Y#BVk=oxY97W%Q7yXV zq%$sAV<#Upq-oVwMB4)4VFA?`1FGjnE1;tRfWRIbkntN)-vH?g(m}16$|2JZ0^8l4 z`Yv^8ziO7S@K8(45mJ<7t7$pF5HfNdK|(>wdXeBXeVyVaC`u~o*wuh4o`g|Y?N*T* z?p{bRQNU0PNITXQ#1E-F3B++>6F|sKK}r!tRjt&OK=kuT5FsE;R0{lC6#qt>^BjV- z=;vVXbDZi=j(``@B*kygy?=*mO5;6GV#S~xa0_yA+tCTRaaC){92fO!$nk>}4$2 zWeNXUmRQv**DA}cis}DPkZQvqM}wGI)y95gp#q&s(Xl;M0w~ong|;&;2xGvUSCz#S z!*drh2xy1{eY{i>Djm2_;iW znQJVPUX)H9>7~Wzd`m#V5vS2YL(R$6U$ze4sicW_bAwS*-LZzfg1I2sRT)C_Rgk4nVcJ>(@4Flkqyh#~z<^CM`=EG6 zNj@4=puvU%2sP?683huXQ=<@1VCYW{Cur3sGtwKEGK#XtH3XJaWFJLPXj3c<7IPtG YrhU!5NymXSlK+djBAh5lNUQfH0HutTGXMYp literal 904 zcmV;319$vFT4*^jL0KkKSwEAmzyJZF|BcO12moGn|DS%h-#-8U|LQ;h009sH00>Y6 zUNC_|lt&pdXwVuo#AIk<7!yXAgAt&@01OhEiK8lQJrhM5Ju-SzMvqCg0L0TqjR4w% zLqkEvOqw(XjWHP-7={GVrXa*FB)_KENL##Xx0%y1T-cG z$5mX=4F4UZUxX#G*&?T4cOLp~F+C>w@8o4N25{vDjSnb6q>&)83>YwKe5yedBL;5G z+tg=ncvDtBN2@DVQV`Y0%|LU_je~L9*lc-nwgd5a;kcg%Rw*sG=7-HwPPs!QUP5ZV zj1Rzq921omBcfQNa(PuGf0*B5ovTfzF7z4CSA%J1?xDz@!o;%dChb3x(BPLXts8|-71 zL8@IwSbOh(Psf%*oNwjzUS zvo;fo9@b8*%$YBfQR0UP(P*mMAz#toF0rbNK@IU|9_%$~pjc(i*cz&8wWKtGRckoS zt@tfNxU!a$QVo}Dfd+^`4p#1%gC0P0?PfNvuLRai;Tz=BHt6l^RL!!?i?l~x&7qMn z4h(u3^+FEUq*V%(kHRY5mBEeTAr5rFwUGgdv|6!aWNwm;ghFm-=7=art2tUhVR>s) zF9dAV&g)f{Nh)N~m?cY+H*TRJOj5eN6pbc9omMhs4i!S{xba38%)ix4gIPu^zCnmJ z8x}3Pu$e7+NMN9hXkWNOr84vx4A4=Sg62lcgVP>O1?Pz(8t+onu^a*`8Zi%g8LOG>0<&6oVi+-#U{_`8xR!i0hRopu1Dew$GM diff --git a/Tests/ExternalProjectLocal/Step1.tgz b/Tests/ExternalProjectLocal/Step1.tgz index d9b4cd259de4fa762521788b1f51e3b2f838cad0..c1f36a3906123c56f619a47e77b4a8044ef51268 100644 GIT binary patch literal 820 zcmV-41Izp$iwFP!000001MQaYPuf5j$9dhq;t9^AECgC;Z8F`WW4^#lSpZFz%```Q zz)jlX-BnqP|NEZ)00FCH3A&iw=S69sdw!Lt`QG&;otpL1i((*-V<*3+V;jrAb4sS= zn6_g(4F~O}X;@|n?3ZmTBNmcyfYKEUM}uelHm$!=dg=UIr{s!$WkQOYoXKt1NCv!T zSx?R1G@91h{F``N0%O~a6!D+W-wSZ^Zoono#DUA{b<8;RLBBZe_S&5@Xx5r$MVs>I z7xg6Q{a8kvkx50zZZKauIUR9-%pzu zu#oWIAUUOrz9`||7~eyVVHj~>p*M+rn!aGtzDV4Ngj))?Y%)Q6=)-y;Est`2oRpWW zQK1(%Szc*~&ZrklGMG>eP42_vVjv*%o0>P9RkVNoZ7N=#O#heXzWo}T^xrh?5^e%b z%V}7)*-Z4`G90D9DX7+TCSByk?#%%&8aX}_Ag^xgFG}O~TGYia} zu*i~^xaLxSh)W&UJL*3k?CuDd!0Xz7^pL2!Tqn(%cWvxz_iDp(#S+OjS-f+(q0eiv^-F$x=gtm)8+W*cO{l&g; zrIo2?deb#*>)HO>RYg9>zZH8Y zuIUR<&r3;+ctquI(2}tQFGi(1!S~P;@Pz~(xk2o)^aT_8DsiJ4ZW-M2AV7QM!FnN* zM>!rg%1!2&GKxu7R|v5gb7M_M0V8N~9v&AB0i6#_cQ&h$zr8d|Yyp}6FE@VkHD1zx zRQ`4Sx2#hCw}M6kjzRHoisFbeKbADiM93B4G}cUI%5@!6lw>J{PQ;hydQW!d682tc zj|+41an%&?(W)&(?OU-_9}6ieoQ9C{2#jPz<=Cx*JE0QZ;`rwKRgK)C+HxO^WDefL zUX3IR=`OwcQ;A`|f#pT4>(yNam-#NW>zTXWkEmKFu!J-1>67?DP3GBor4Ppi#fNJ3zX`r12=1y2-$xB^J zZ9K%Kj_Ztuj~lx?2CneB_KhAA)tBp}S##FbA-OMijDHWA{ui8mHdx~Y{m1dT{beyesN6pKuk4ir2>kF&-vLpJ+96d3EA-&9!=R38VN_m_M>Ow(jS0=xWs-$ VN?j>YqC|T9z?+$civa|BrsYS18Bl_aL53l?B(=a$KQx4sfqBP0^YmjtTw1}+z{v7~ znSlXJfb@$1b#Q?7ADc9dPmhs-L57KeL4-kOas#tyJwDx~6A$_wHsEP{U&)nS@IsGu zi@L5tJ_RAcL~)O71T7AJuV3j#a>UW*-!zQOhUz)ik`*B(6nkRx~4Ii)JsOwY_c zIKJF$!jX=k6MZ&z2|{cJyZ-E0e=2g`+8>*0R&1JcU-atptL1BQUUkVTzQ~nyvMMU-;$;^zRIqkn>1xU*j#I4CUJk3L-Z2zptA8VT1FHm)m+v z7e9EfQ1;@HR-D&2sa;QMPF(aEO_|2?g;#6E z0wZxL5K981?GBTa3^>{xGK#S2ocxU`v0jcDSGtjarXT@^zm6a#EETarQV~W9Vq}tI z#+8O3W&u6Pu%yueZkDre;^Z!7Zs*Vt!e(NI6tbCnCLdrHbpe|L3MM>m!we{7bIh41 gGqOnQfeiwM8iqlvY(UpDumE8!&^OP4`G^-0|Kos`uc99jbNb&)c8gB&>hJI=4jJ z%I}Ai$-<^5g+aPqMSRz9`kpdNnIBl?G3{XVrA5Ay*3GHSAKIR5F->sV?sRI#;ds4$ z{0}#O+_L6@)?a_UXMy`Zks5lK!c7t@$5zFZ#9T$FWoGeQQo` zk(Aw?-~Dq(mDSsKYY#Iytz=AE+Pk3qLrcX2C&x{l)j!y>ychK5G#^SlD0ly>*~5gy z?hRLSrC+-pyziKE|7fVqlsBd&Co@l66cl(Dz@{IjyD8$4{r$s^2j0uiyz@5b8!Kvf z-mLn%LmwEPzQFJl0)}#MNos+ieo1LbeoA=$PE;3Rz!5z_Wgq}F9Rxs;l@s92$b_sO-FlEhi24K|h3Ob{{isd?>4xdw Y&jfOySb#Sx8%U5D2u}j(U}g{x0QIlfEC2ui diff --git a/Tests/ExternalProjectLocal/Step1NoDir.tar b/Tests/ExternalProjectLocal/Step1NoDir.tar index 03664b856bb33849d2480c4f4607623807aeaf57..c60961cf07dc89e1a4a4ca887dae914d52596979 100644 GIT binary patch delta 316 zcmZqBXb6~)Vrc*bW+o;KK+4eE)Bu?VNf{a#n=lxfm>Zg!o0=P$1LX~k%nS?}6bvRC zGN$mB7MCOzDJU>xXXd3RO%#-71v4fqvRsKWNd0=PS~PN94Sl$ePL(_HQXF%jiE8f7bZZ8pf48jaBNQCTfmA!C@=#6 Dt;tJl delta 308 zcmZn&XwaCDVrgh#U~X!vz@VU@U~UGX6^u;4e4vnmp@Fe6kT5qlGBPwVH!=i@7#o_J zD=-*LHe^f@EG;fcEMhP)NJ%WqOi9kqNu4Mt&I%MuOPj37a%mEi0<)2x*=7}{JIs^+ zv!)WV3}~?_*hUi*GZUc0fR+I%BjPOE#F4^8$O1z{L#PGjK&uRmLB26CFeA=_MLZk; DDey=~ diff --git a/Tests/ExternalProjectLocal/Step1NoDir.tar.bz2 b/Tests/ExternalProjectLocal/Step1NoDir.tar.bz2 index 92eb480d6a4473ed4018c04808d5d1f706cf0357..f4edfa89008ecf87e5d5c2ccb895fb6ac1e1dc03 100644 GIT binary patch literal 846 zcmV-U1F`%Y3gd83O1w4Ff}q{)6mmRO*Hik+NY&< zeEaukO(fPcGDvC?LN(v6foxH8fP<-}kOlx9I8&$V%Hf~u#zC(L@HG)8)Q5Te*Z3Xn z*nFtFm5TB#VpS#pngNP-cHPe#*KDUnRj*W8x<6jq5J6$eta!ua#DLprItbCo0WhVn zl{1sB=wd>%2-12e=Ny1bt!D$|B4mZ}k&YKa|6w=DuoV~tj-*qDQ$SS}9@ZU;t8`?w z-F{a>j$c1H-Fp@kQ3$^btx)0B_~169Pfo`(a2^Kvk#q~ELQu}&x4s>IBoP;>(~4@2 z;u)djndT^&91keqfT*dX=abOxM~a1E8q?dgleq}N-jO^W5sj(GD~Ou^83t9_Eej~? zAatKHG4ShLD3bTCKXi7nlbG6!VrckC0HI*QDvuqc|5*ujy_iW&!ML9A;<>W*!JOAjA0KXyzL-g zVL*1MLbfWaH;IYoJmU4-z)f7xr_D$1@FXyis9v{On-F?NlQx6<8nye{F2Wi4TEUje zMrA>o!xQzfDdl2Be$1hX_d>P3I;nau@Q=i0F}od&y!PbTSW;%*(Jn*jy7#{ zp{6R0Rlt&nZ`rNKWIKV#&18faS^H8q@!4Jm&A=4jQr{KD^5XAmFs=M0FSeiiMm4E_ zsq?Y}E~Ysh+Q!x?3fp1yg0}h{hHPWM*)SC`02mW8Dp>L{3nHOOD9GwVr-?m92?Zs^ zOr#oSpFH+b%+sZ9E(yCa&5|s`Ts2uO(=k+#XH*PGtlc-V&MYu{q+RQ;7|SrivgM@U zS958!#Y<%#%EVy-q@r4b36<0&Agzc|Sa?H^c)(te`mRyXu$z z9Y<>!XaGtopOR^jJc;OyJtmJ(c~4VAA&@cvXc}k-s5ykt8Usd*BSDDM6DB5u2+%SC zlL3&E6k=G#bbeSea zO}VGkgo>4@X@gC8d_1#KLonv<>hVi@>z!FO{xNyVO-t$NitD`M z4l{-0vGdoye#cc_+b5#9lcT@kbZ%ikzLrY{d@RjgcM~N=eYzuqrZ35fo5wWn)l`ZmRXbIh8XB6qel(z%Ml9vEB;~C~Q#_FiS#>ju7YYkx>7!!I%8f+^g169O zLe1SQoy@}FN}DWV(=@WE+j>rTmN7vBq2`w}37MQ_E^Mjpz58-vLkkh*0EGO&}12TdP^cdT__EieTc6KcYC|a&T zmb|N@QPMbgxVcNK*BHh)sxATBG|S8 zRz;|12K%-l+*fUc)Pr^0uprS00pM=wh%wBe98x)R-*q0H!Cw0n4rzSf7gZN>g>dgz z{_Dgvv;-D9+4I5<$FNlj+hgyFvvx=^ya+@7ObZzh7@I|l3|SkbqgfR!pX{&8*x~p60o2m_*Gs&^gc4xo6P^?HbEQ2OmajF+x&xBz~l>F_?HKby@ zwP3cJmK-+aGg$PHzR?(@IjI>?Vrhbm#1^tSEf17?`i!RZh<7NZv0!mgSfc^>6vl-j epuaL^gA*l&j$OP{he}|-@pmLsg$W2K0u(@hS%u30 diff --git a/Tests/ExternalProjectLocal/Step1NoDir.tgz b/Tests/ExternalProjectLocal/Step1NoDir.tgz index 71a2d814217eade48fa2856e7e83f32cbc6ff53b..66facf6d0ab4994b52cc26749708f9d7356012ab 100644 GIT binary patch literal 785 zcmV+s1Md7EiwFP!000001MQaYPuf5j$9dhq;t7tVETpzjB$;l}F<)S&EQlt{W}2hD z!fmvNcUNUG{_lIP6a+ z5cE1@f<|Cp9{0{W-7{!74XBp2lpL2?_*8ltffO%*GTHhY67qBu^;t7!($7>z5ZW zr^3yV7>rKZE_o(Gim4)ME%F6<8ruRWzq|X^>z*99`@wnlqSrnSzI1x`yYsf%d4w}^ zSXy57{@gh`>V04DtzGj6AW@VzF<>bXe?SRJ7kyD8!Vx})8bQnjurwTJ5zQY^w=cCD zQE*G)mW{_~Pa}9-$SR_O2zM&fYgF3nn=G$1M5i>&6d8=Eg{I))cCjI#iVG*4POH{i zzng~bv*xA$=QTFyzgzd4CHxa;`2L>nxmy1l&3en||7)Gctd;-hTK(T(19X;zSTEmQ)pq31sz zPv-l71@QYn0?CpI&PF)p4FySNGf2pjNv5cr4KCLi!HG<8uJr6higC}{nNKhWQbmkA zqfe`*F&nJf5*&S2Eaj(j6b?8F62elj^%W7rum<4>cj-M|-~70$T6Z{Xu^4Q<1_w~D z;yu7!evBsq!(toD^Gwys6$zKckXnhHO7t@=*K)@>c~bXk)wo{6Hu-41s_w6C<3f@l z{Q%g_?6=cx6qSnzK~*MF@Md@Sc*IB?&u~n{owy|9jKW7CipO>y=*v<=MaDiVi7EC{6g3)^2LY`ardoiPB2bRz)Up zz*`bi+i97q{`cLOK%u4U%V3(6^WZqw_bah;a=K^qC;QBmR<@q$(pKO)PN&s^5&(4C z^DESw^DDx28VwveoqFAEcIqx#8g8otC1*SBtRq#L%97&*^p*#{h}a8$=oW^%XlS?a zW88l)<_V9}*puug<&p(pU7ZXrdi`^#+wCfuO7VmF8mwWeh2%7<60!%w34>cE6&DF4 zX*^=mCW@_id3h4=?D(`l0Jr+ma_=0M9h1}-Nyx{kWI$oUXuu?dJYt{)OsP_!M9e^h zps{#2JG+26HBZJ0gV8CoE0Ic{VXAvZni#ym^GBQQM}LSjKY$H!nf-_qOtd|$QvSATyr%zLH~;=S$OLX9 z(|?ZBF24U=0KflZP&}TZI6|2>mNcG=5MRX8R5LYKE;lJfNhXERnfRi)-XnVp33I4) zz=b{eux^U@Xx$d0_F1!(p9?8eI2vNg6R@%wm1DmK{)9?+i}TxW*Hv3*!tx^3wQ@zlRjyJifn5o{C*>M}6_}*X^}2C0hrQ;L@m2L;V;h%> zj@diFZszYUYa_3mM@XhqnSeXLd%zJRQJHfh!!JyraiNwbeQ%Yu>eUKpqO7E>NIAf&T};0Tl0fbO00p0OR6? A3jhEB diff --git a/Tests/ExternalProjectLocal/Step1NoDir.zip b/Tests/ExternalProjectLocal/Step1NoDir.zip index b42d318798ed7237fb07687519e67973183ff0a1..6717202962be54864e183b1af723cde4b0a2f7ac 100644 GIT binary patch delta 784 zcmeCG7QeXiP@<>nZ+f=dLVsfA?H+-o$lplGxiB8@VG)Ir2UHqM6l7vX@M;{PXk?JJ)>w^i)>CFa0q(i)w5g zmYQz8$KoV#VL^aLz-zIC(KooBAGpbP@Y;jNA9CalJEv6Tn(3Lj2gjG2O*qmKbfVA3 zEEZ|P70O;b(u(u? zCbjEH&54Vi3U?Os#I1==*?6RW-|^-Kdz+x0_xo>(L&IGR81RdlGL7d8uhxnMM#EAd z7G{u{e1SxkhMd)DxXM-up%M9=xzaweI|R z`_r3*^-oymmWW&V{g5(Q*z}|@NVltq@A^&OQ)Vgi1FPyirX7sFw8&S|x;eG^L)()r zrU_2lolea-9Iv;J|KaA3Th=_#`s=UvEO4KU(^Au|aqLb47ZwC~1iThI7=44|`GK2! z2d_PN{Gmqdrea!E?lnC#_u%+)vk6BemQIlU^h02>LBqwL$7@6V)PGLWKh>@^|HJM@ zzxMn%cB;K^&B-m2vb*c^yMOMevU>Y&?O`UTm5fPCdl!^{XsLMM z=0k}Gp}0e1ufH8KG0gaXv)4Dd$Pi|#;> tCWziBAO&_V)U`-DeZc7k-LVL*n}NQ?;`9J-RyL3#W+2=Sq#c<-JOC;k>LvgH diff --git a/Tests/ExternalProjectLocal/Step5/CMakeLists.txt b/Tests/ExternalProjectLocal/Step5/CMakeLists.txt index bde264123a..94845fe1d6 100644 --- a/Tests/ExternalProjectLocal/Step5/CMakeLists.txt +++ b/Tests/ExternalProjectLocal/Step5/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.31) project (Tutorial) # The version number. diff --git a/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake b/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake index 08e533b9f1..96dca38874 100644 --- a/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake +++ b/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake @@ -189,16 +189,16 @@ endif() file(REMOVE_RECURSE ${ExternalProjectUpdate_BINARY_DIR}/CMakeExternals) if(do_git_tests) - check_a_tag(origin/master b5752a26ae448410926b35c275af3c192a53722e 1 1 REBASE) - check_a_tag(tag1 d1970730310fe8bc07e73f15dc570071f9f9654a 1 0 REBASE) + check_a_tag(origin/master b5f0fc2d442b72dd29e655c329af0062e1f8d129 1 1 REBASE) + check_a_tag(tag1 4209914b424925d6f1b558d79454d60967d4b0f3 1 0 REBASE) # With the Git UPDATE_COMMAND performance patch, this will not require a # 'git fetch' - check_a_tag(tag1 d1970730310fe8bc07e73f15dc570071f9f9654a 0 0 REBASE) - check_a_tag(tag2 5842b503ba4113976d9bb28d57b5aee1ad2736b7 1 0 REBASE) - check_a_tag(d19707303 d1970730310fe8bc07e73f15dc570071f9f9654a 0 0 REBASE) - check_a_tag(origin/master b5752a26ae448410926b35c275af3c192a53722e 1 1 REBASE) + check_a_tag(tag1 4209914b424925d6f1b558d79454d60967d4b0f3 0 0 REBASE) + check_a_tag(tag2 ae72641040f1c9512f152d08afb6909f0498f958 1 0 REBASE) + check_a_tag(4209914b42 4209914b424925d6f1b558d79454d60967d4b0f3 0 0 REBASE) + check_a_tag(origin/master b5f0fc2d442b72dd29e655c329af0062e1f8d129 1 1 REBASE) # This is a remote symbolic ref, so it will always trigger a 'git fetch' - check_a_tag(origin/master b5752a26ae448410926b35c275af3c192a53722e 1 1 REBASE) + check_a_tag(origin/master b5f0fc2d442b72dd29e655c329af0062e1f8d129 1 1 REBASE) foreach(strategy IN ITEMS CHECKOUT REBASE_CHECKOUT) # Move local master back, then apply a change that will cause a conflict @@ -232,7 +232,7 @@ if(do_git_tests) message(FATAL_ERROR "Could not commit conflicting change.") endif() # This should discard our commit but leave behind an annotated tag - check_a_tag(origin/master b5752a26ae448410926b35c275af3c192a53722e 1 1 ${strategy}) + check_a_tag(origin/master b5f0fc2d442b72dd29e655c329af0062e1f8d129 1 1 ${strategy}) endforeach() # This file matches a .gitignore rule that the last commit defines. We can't @@ -242,7 +242,7 @@ if(do_git_tests) # doesn't choke on it. set(ignoredFile ${ExternalProjectUpdate_BINARY_DIR}/CMakeExternals/Source/TutorialStep1-GIT/ignored_item) file(TOUCH ${ignoredFile}) - check_a_tag(origin/master b5752a26ae448410926b35c275af3c192a53722e 1 1 REBASE) + check_a_tag(origin/master b5f0fc2d442b72dd29e655c329af0062e1f8d129 1 1 REBASE) if(NOT EXISTS ${ignoredFile}) message(FATAL_ERROR "Ignored file is missing") endif() diff --git a/Tests/ExternalProjectUpdate/gitrepo.tgz b/Tests/ExternalProjectUpdate/gitrepo.tgz index 4dab56be601c1416438c7987efd67d2fe0c20fe5..be00071dd0cbb0513ce5657435e041b255a08cc6 100644 GIT binary patch literal 3550 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 bzsR#brHH168fvKV7sUSoV> Date: Sun, 17 Nov 2024 12:02:19 -0500 Subject: [PATCH 09/14] Tests: Use latest cmake_minimum_required possible for old policy cases --- Tests/CMakeCommands/target_link_libraries/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0019/CMakeLists.txt | 2 +- Tests/RunCMake/GeneratorExpression/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt index 9eeb532a11..9a67754749 100644 --- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt +++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt @@ -1,7 +1,7 @@ # Using 2.8 will trigger a deprecation warning. In this case it's explicitly # intentional since the tests checks various policy implementations prior to # 3.10 -cmake_minimum_required(VERSION 2.8.10) # old enough to not set CMP0022 +cmake_minimum_required(VERSION 2.8.11) # old enough to not set CMP0022 if(POLICY CMP0129) cmake_policy(SET CMP0129 NEW) diff --git a/Tests/RunCMake/CMP0019/CMakeLists.txt b/Tests/RunCMake/CMP0019/CMakeLists.txt index 8f85fbf540..129b75c0ab 100644 --- a/Tests/RunCMake/CMP0019/CMakeLists.txt +++ b/Tests/RunCMake/CMP0019/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 2.8.4) +cmake_minimum_required(VERSION 2.8.10) project(${RunCMake_TEST} NONE) include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) diff --git a/Tests/RunCMake/GeneratorExpression/CMakeLists.txt b/Tests/RunCMake/GeneratorExpression/CMakeLists.txt index bd7fdd1b0c..e82802852f 100644 --- a/Tests/RunCMake/GeneratorExpression/CMakeLists.txt +++ b/Tests/RunCMake/GeneratorExpression/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10) if(RunCMake_TEST STREQUAL "CMP0044-WARN") - cmake_policy(VERSION 2.8.11) # old enough to not set CMP0044 + cmake_policy(VERSION 2.8.12) # old enough to not set CMP0044 endif() project(${RunCMake_TEST} NONE) include(${RunCMake_TEST}.cmake) From 34070c3319099c565967cea3fae1141099c6f040 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 19 Nov 2024 14:28:00 -0500 Subject: [PATCH 10/14] Tests/CMakeCommands/target_link_libraries: Fix keyword consistency --- Tests/CMakeCommands/target_link_libraries/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt index 9a67754749..341b135660 100644 --- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt +++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt @@ -151,7 +151,7 @@ add_subdirectory(SubDirB) target_link_libraries(SubDirB TopDirImported) add_subdirectory(SubDirC) target_link_libraries(SubDirC PRIVATE SubDirC2) -target_link_libraries(TopDir SubDirC) +target_link_libraries(TopDir PRIVATE SubDirC) add_library(TopDirImported IMPORTED INTERFACE) target_compile_definitions(TopDirImported INTERFACE DEF_TopDirImported) cmake_policy(POP) From c941f728ec9345dc10014b0c57693c931f1651e0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 19 Nov 2024 15:02:18 -0500 Subject: [PATCH 11/14] Tests/CPackComponentsForAll: Update cmake_minimum_required to 3.10 This was missed by commit 9e3b559b6a (Tests: Update cmake_minimum_required versions to 3.10, 2024-10-03, v3.31.0-rc1~23^2~1). --- Tests/CPackComponentsForAll/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/CPackComponentsForAll/CMakeLists.txt b/Tests/CPackComponentsForAll/CMakeLists.txt index a1a9709bd3..253a03554b 100644 --- a/Tests/CPackComponentsForAll/CMakeLists.txt +++ b/Tests/CPackComponentsForAll/CMakeLists.txt @@ -7,7 +7,7 @@ # Depending on the CPack generator and on some CPACK_xxx var values # the generator may produce a single (NSIS, productbuild) # or several package files (Archive Generators, RPM, DEB) -cmake_minimum_required(VERSION 2.8.3.20101130 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10 FATAL_ERROR) project(CPackComponentsForAll) # Use GNUInstallDirs in order to enforce lib64 if needed From 96a0cded7fc4d9527cdddaef85738fdefd0537ee Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 18 Nov 2024 19:51:14 -0500 Subject: [PATCH 12/14] Tests: Avoid enabling C unnecessarily in CMP0022 and CMP0023 cases --- Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW.cmake | 2 +- Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake | 2 +- Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old.cmake | 2 +- Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake | 2 +- Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake | 2 +- Tests/RunCMake/CMP0022/CMP0022-WARN.cmake | 2 +- Tests/RunCMake/CMP0022/CMP0022-export.cmake | 2 +- Tests/RunCMake/CMP0022/CMP0022-install-export.cmake | 2 +- Tests/RunCMake/target_link_libraries/CMP0023-NEW-2.cmake | 2 +- Tests/RunCMake/target_link_libraries/CMP0023-NEW.cmake | 2 +- Tests/RunCMake/target_link_libraries/CMP0023-WARN-2.cmake | 2 +- Tests/RunCMake/target_link_libraries/CMP0023-WARN.cmake | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW.cmake b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW.cmake index 3fee15d8b9..308980c59c 100644 --- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW.cmake +++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW.cmake @@ -1,5 +1,5 @@ -project(CMP0022-NOWARN-static-NEW) +enable_language(CXX) cmake_policy(SET CMP0022 NEW) diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake index 3e4144fcd5..17f71b0326 100644 --- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake +++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake @@ -1,5 +1,5 @@ -project(CMP0022-NOWARN-static) +enable_language(CXX) add_library(foo STATIC empty_vs6_1.cpp) add_library(bar STATIC empty_vs6_2.cpp) diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old.cmake b/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old.cmake index c5d3c29d9f..7356e29d34 100644 --- a/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old.cmake +++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old.cmake @@ -1,5 +1,5 @@ -project(CMP0022-WARN-empty-old) +enable_language(CXX) add_library(foo SHARED empty_vs6_1.cpp) add_library(bar SHARED empty_vs6_2.cpp) diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake b/Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake index b3cb13160a..0ea4fe5a50 100644 --- a/Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake +++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake @@ -1,5 +1,5 @@ -project(CMP0022-WARN) +enable_language(CXX) add_library(foo STATIC empty_vs6_1.cpp) add_library(bar STATIC empty_vs6_2.cpp) diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake b/Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake index 03223e86a1..ba207db78a 100644 --- a/Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake +++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake @@ -1,5 +1,5 @@ -project(CMP0022-WARN-tll) +enable_language(CXX) add_library(foo SHARED empty_vs6_1.cpp) add_library(bar SHARED empty_vs6_2.cpp) diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN.cmake b/Tests/RunCMake/CMP0022/CMP0022-WARN.cmake index e3552b2f04..38adccaef5 100644 --- a/Tests/RunCMake/CMP0022/CMP0022-WARN.cmake +++ b/Tests/RunCMake/CMP0022/CMP0022-WARN.cmake @@ -1,5 +1,5 @@ -project(CMP0022-WARN) +enable_language(CXX) cmake_policy(SET CMP0042 NEW) diff --git a/Tests/RunCMake/CMP0022/CMP0022-export.cmake b/Tests/RunCMake/CMP0022/CMP0022-export.cmake index 06147f39ee..e121b53626 100644 --- a/Tests/RunCMake/CMP0022/CMP0022-export.cmake +++ b/Tests/RunCMake/CMP0022/CMP0022-export.cmake @@ -1,5 +1,5 @@ -project(cmp0022NEW) +enable_language(CXX) cmake_policy(SET CMP0022 NEW) diff --git a/Tests/RunCMake/CMP0022/CMP0022-install-export.cmake b/Tests/RunCMake/CMP0022/CMP0022-install-export.cmake index 171febe3a6..532e204b8f 100644 --- a/Tests/RunCMake/CMP0022/CMP0022-install-export.cmake +++ b/Tests/RunCMake/CMP0022/CMP0022-install-export.cmake @@ -1,5 +1,5 @@ -project(cmp0022NEW) +enable_language(CXX) cmake_policy(SET CMP0022 NEW) diff --git a/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2.cmake b/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2.cmake index f8b354690c..f87a684991 100644 --- a/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2.cmake +++ b/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2.cmake @@ -1,5 +1,5 @@ -project(CMP0022-WARN) +enable_language(CXX) cmake_policy(SET CMP0023 NEW) diff --git a/Tests/RunCMake/target_link_libraries/CMP0023-NEW.cmake b/Tests/RunCMake/target_link_libraries/CMP0023-NEW.cmake index f0aa63fbd4..211029bf93 100644 --- a/Tests/RunCMake/target_link_libraries/CMP0023-NEW.cmake +++ b/Tests/RunCMake/target_link_libraries/CMP0023-NEW.cmake @@ -1,5 +1,5 @@ -project(CMP0022-WARN) +enable_language(CXX) cmake_policy(SET CMP0023 NEW) diff --git a/Tests/RunCMake/target_link_libraries/CMP0023-WARN-2.cmake b/Tests/RunCMake/target_link_libraries/CMP0023-WARN-2.cmake index a5bf2fbb55..a175a6118c 100644 --- a/Tests/RunCMake/target_link_libraries/CMP0023-WARN-2.cmake +++ b/Tests/RunCMake/target_link_libraries/CMP0023-WARN-2.cmake @@ -1,5 +1,5 @@ cmake_policy(VERSION 2.8.11) -project(CMP0022-WARN) +enable_language(CXX) add_library(foo SHARED empty_vs6_1.cpp) add_library(bar SHARED empty_vs6_2.cpp) diff --git a/Tests/RunCMake/target_link_libraries/CMP0023-WARN.cmake b/Tests/RunCMake/target_link_libraries/CMP0023-WARN.cmake index d6f34a1d8d..7fbb70e3bb 100644 --- a/Tests/RunCMake/target_link_libraries/CMP0023-WARN.cmake +++ b/Tests/RunCMake/target_link_libraries/CMP0023-WARN.cmake @@ -1,5 +1,5 @@ cmake_policy(VERSION 2.8.11) -project(CMP0022-WARN) +enable_language(CXX) add_library(foo SHARED empty_vs6_1.cpp) add_library(bar SHARED empty_vs6_2.cpp) From 577e693d3ee04dd0a7e1cab8ce593bbc3832084c Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 6 Nov 2024 15:09:13 -0500 Subject: [PATCH 13/14] Help: Use standard policy advice in CMP0000 This was missed in commit ad3c2c0b03 (Help: Normalize and consolidate standard policy advice paragraph, 2024-01-11, v3.29.0-rc1~124^2~2). --- Help/policy/CMP0000.rst | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Help/policy/CMP0000.rst b/Help/policy/CMP0000.rst index aecfa71876..5f146bc47a 100644 --- a/Help/policy/CMP0000.rst +++ b/Help/policy/CMP0000.rst @@ -21,14 +21,12 @@ the project. See documentation of :command:`cmake_minimum_required` for details. Note that the command invocation must appear in the ``CMakeLists.txt`` -file itself; a call in an included file is not sufficient. However, -the :command:`cmake_policy` command may be called to set policy ``CMP0000`` -to ``OLD`` or ``NEW`` behavior explicitly. The ``OLD`` behavior is to -silently ignore the missing invocation. The ``NEW`` behavior is to issue -an error instead of a warning. An included file may set ``CMP0000`` -explicitly to affect how this policy is enforced for the main -``CMakeLists.txt`` file. +file itself; a call in an included file is not sufficient. The ``OLD`` +behavior was to silently ignore the missing invocation. The ``NEW`` +behavior is to issue an error instead of a warning. -This policy was introduced in CMake version 2.6.0. +.. |INTRODUCED_IN_CMAKE_VERSION| replace:: 2.6.0 +.. |WARNS_OR_DOES_NOT_WARN| replace:: warns +.. include:: STANDARD_ADVICE.txt .. include:: DEPRECATED.txt From 94b2d56017f98c86aa909f7e956dad92f44ac923 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 19 Nov 2024 17:42:02 -0500 Subject: [PATCH 14/14] Help/policy/CMP0015: Remove stray indentation --- Help/policy/CMP0015.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Help/policy/CMP0015.rst b/Help/policy/CMP0015.rst index cd65c3f56b..2e185069c9 100644 --- a/Help/policy/CMP0015.rst +++ b/Help/policy/CMP0015.rst @@ -1,7 +1,7 @@ CMP0015 ------- - :command:`link_directories` treats paths relative to the source dir. +:command:`link_directories` treats paths relative to the source dir. In CMake 2.8.0 and lower the :command:`link_directories` command passed relative paths unchanged to the linker. In CMake 2.8.1 and above the