From f188f74bbde0457f09c61d9e5ef24da3b4be18e9 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 6 Aug 2026 17:36:49 -0400 Subject: [PATCH] KWSys: update for `CopyWhen::{Always => Unconditional}` rename KWSys renamed `Always` to `Unconditional` because the former conflicts with a X11 macro. --- Source/cmFileCommand.cxx | 2 +- Source/cmSystemTools.cxx | 2 +- Source/cmcmd.cxx | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index fb82c3cce3..2ebf38c9c5 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -1570,7 +1570,7 @@ bool HandleCopyFile(std::vector const& args, if (arguments.OnlyIfDifferent) { when = cmSystemTools::CopyWhen::OnlyIfDifferent; } else { - when = cmSystemTools::CopyWhen::Always; + when = cmSystemTools::CopyWhen::Unconditional; } cmSystemTools::CopyInputRecent const inputRecent = arguments.InputMayBeRecent ? cmSystemTools::CopyInputRecent::Yes diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index f5e98ce09b..5db9545a14 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1556,7 +1556,7 @@ cmSystemTools::CopyResult cmSystemTools::CopySingleFile( CopyInputRecent inputRecent, std::string* err) { switch (when) { - case CopyWhen::Always: + case CopyWhen::Unconditional: break; case CopyWhen::OnlyIfDifferent: if (!FilesDiffer(oldname, newname)) { diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 517767acc7..ac245f837c 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -1096,7 +1096,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector const& args, if (args[1] == "copy_directory" || args[1] == "copy_directory_if_different" || args[1] == "copy_directory_if_newer") { - cmsys::SystemTools::CopyWhen when = cmsys::SystemTools::CopyWhen::Always; + cmsys::SystemTools::CopyWhen when = + cmsys::SystemTools::CopyWhen::Unconditional; if (args[1] == "copy_directory_if_different") { when = cmsys::SystemTools::CopyWhen::OnlyIfDifferent; } else if (args[1] == "copy_directory_if_newer") {