|
@@ -468,18 +468,18 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
|
|
|
// If multiple source files specified,
|
|
|
// then destination must be directory
|
|
|
if ((args.size() > 4) &&
|
|
|
- (!cmSystemTools::FileIsDirectory(args[args.size() - 1]))) {
|
|
|
- std::cerr << "Error: Target (for copy command) \""
|
|
|
- << args[args.size() - 1] << "\" is not a directory.\n";
|
|
|
+ (!cmSystemTools::FileIsDirectory(args.back()))) {
|
|
|
+ std::cerr << "Error: Target (for copy command) \"" << args.back()
|
|
|
+ << "\" is not a directory.\n";
|
|
|
return 1;
|
|
|
}
|
|
|
// If error occurs we want to continue copying next files.
|
|
|
bool return_value = false;
|
|
|
for (std::string::size_type cc = 2; cc < args.size() - 1; cc++) {
|
|
|
if (!cmSystemTools::cmCopyFile(args[cc].c_str(),
|
|
|
- args[args.size() - 1].c_str())) {
|
|
|
+ args.back().c_str())) {
|
|
|
std::cerr << "Error copying file \"" << args[cc] << "\" to \""
|
|
|
- << args[args.size() - 1] << "\".\n";
|
|
|
+ << args.back() << "\".\n";
|
|
|
return_value = true;
|
|
|
}
|
|
|
}
|
|
@@ -491,18 +491,18 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
|
|
|
// If multiple source files specified,
|
|
|
// then destination must be directory
|
|
|
if ((args.size() > 4) &&
|
|
|
- (!cmSystemTools::FileIsDirectory(args[args.size() - 1]))) {
|
|
|
+ (!cmSystemTools::FileIsDirectory(args.back()))) {
|
|
|
std::cerr << "Error: Target (for copy_if_different command) \""
|
|
|
- << args[args.size() - 1] << "\" is not a directory.\n";
|
|
|
+ << args.back() << "\" is not a directory.\n";
|
|
|
return 1;
|
|
|
}
|
|
|
// If error occurs we want to continue copying next files.
|
|
|
bool return_value = false;
|
|
|
for (std::string::size_type cc = 2; cc < args.size() - 1; cc++) {
|
|
|
- if (!cmSystemTools::CopyFileIfDifferent(
|
|
|
- args[cc].c_str(), args[args.size() - 1].c_str())) {
|
|
|
+ if (!cmSystemTools::CopyFileIfDifferent(args[cc].c_str(),
|
|
|
+ args.back().c_str())) {
|
|
|
std::cerr << "Error copying file (if different) from \"" << args[cc]
|
|
|
- << "\" to \"" << args[args.size() - 1] << "\".\n";
|
|
|
+ << "\" to \"" << args.back() << "\".\n";
|
|
|
return_value = true;
|
|
|
}
|
|
|
}
|
|
@@ -514,9 +514,9 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
|
|
|
// If error occurs we want to continue copying next files.
|
|
|
bool return_value = false;
|
|
|
for (std::string::size_type cc = 2; cc < args.size() - 1; cc++) {
|
|
|
- if (!cmSystemTools::CopyADirectory(args[cc], args[args.size() - 1])) {
|
|
|
+ if (!cmSystemTools::CopyADirectory(args[cc], args.back())) {
|
|
|
std::cerr << "Error copying directory from \"" << args[cc]
|
|
|
- << "\" to \"" << args[args.size() - 1] << "\".\n";
|
|
|
+ << "\" to \"" << args.back() << "\".\n";
|
|
|
return_value = true;
|
|
|
}
|
|
|
}
|