dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-08 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'update-kwsys'

Browse Source 
f188f74bbd KWSys: update for `CopyWhen::{Always => Unconditional}` rename
4684e97400 Merge branch 'upstream-KWSys' into update-kwsys
0add8c6329 KWSys 2026-08-08 (19691df6)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12383
This commit is contained in:
Brad King
2026-08-08 14:29:07 +00:00
committed by Kitware Robot
parent ebd3af92f9 f188f74bbd
commit 2e85f43db1
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmFileCommand.cxx
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

2
Source/cmSystemTools.cxx
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)) {

3
Source/cmcmd.cxx
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") {

6
Source/kwsys/SystemTools.cxx
View File

@@ -2599,7 +2599,7 @@ SystemTools::CopyStatus SystemTools::CopyAFile(std::string const& source,
SystemTools::CopyWhen when)
{
switch (when) {
case SystemTools::CopyWhen::Always:
case SystemTools::CopyWhen::Unconditional:
return SystemTools::CopyFileAlways(source, destination);
case SystemTools::CopyWhen::OnlyIfDifferent:
return SystemTools::CopyFileIfDifferent(source, destination);
@@ -2617,7 +2617,7 @@ SystemTools::CopyStatus SystemTools::CopyAFile(std::string const& source,
bool always)
{
return SystemTools::CopyAFile(source, destination,
always ? CopyWhen::Always
always ? CopyWhen::Unconditional
: CopyWhen::OnlyIfDifferent);
}
@@ -2670,7 +2670,7 @@ Status SystemTools::CopyADirectory(std::string const& source,
std::string const& destination, bool always)
{
return SystemTools::CopyADirectory(source, destination,
always ? CopyWhen::Always
always ? CopyWhen::Unconditional
: CopyWhen::OnlyIfDifferent);
}

8
Source/kwsys/SystemTools.hxx.in
View File

@@ -665,7 +665,7 @@ public:
enum class CopyWhen
{
Always,
Unconditional,
OnlyIfDifferent,
OnlyIfNewer,
};
@@ -675,20 +675,20 @@ public:
*/
static CopyStatus CopyAFile(std::string const& source,
std::string const& destination,
CopyWhen when = CopyWhen::Always);
CopyWhen when = CopyWhen::Unconditional);
static CopyStatus CopyAFile(std::string const& source,
std::string const& destination, bool always);
/**
* Copy content directory to another directory with all files and
* subdirectories. The "when" argument controls when files are copied:
* Always: all files are always copied.
* Unconditional: all files are always copied.
* OnlyIfDifferent: only files that have changed are copied.
* OnlyIfNewer: only files that are newer than the destination are copied.
*/
static Status CopyADirectory(std::string const& source,
std::string const& destination,
CopyWhen when = CopyWhen::Always);
CopyWhen when = CopyWhen::Unconditional);
static Status CopyADirectory(std::string const& source,
std::string const& destination, bool always);