mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

KWSys: update for CopyWhen::{Always => Unconditional} rename

Browse Source 
KWSys renamed `Always` to `Unconditional` because the former
conflicts with a X11 macro.
This commit is contained in:
Ben Boeckel
2026-08-08 10:25:19 -04:00
committed by Brad King
parent 4684e97400
commit f188f74bbd
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFileCommand.cxx
+1 -1
View File
@@ -1570,7 +1570,7 @@ bool HandleCopyFile(std::vector<std::string> 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
Source/cmSystemTools.cxx
+1 -1
View File
@@ -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)) {
Source/cmcmd.cxx
+2 -1
View File
@@ -1096,7 +1096,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> 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") {