diff options
| -rw-r--r-- | .clang-tidy | 1 | ||||
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 2 | ||||
| -rw-r--r-- | Source/cmSetPropertyCommand.cxx | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/.clang-tidy b/.clang-tidy index 9638473cb3..8e8ebdad02 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -17,7 +17,6 @@ modernize-*,\ -modernize-use-trailing-return-type,\ -modernize-use-transparent-functors,\ performance-*,\ --performance-no-automatic-move,\ -performance-trivially-destructible,\ readability-*,\ -readability-convert-member-functions-to-static,\ diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index a8c9df687a..1cb5d00902 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1675,7 +1675,7 @@ std::string cmCTestTestHandler::FindExecutable( // if everything else failed, check the users path, but only if a full path // wasn't specified if (fullPath.empty() && filepath.empty()) { - std::string const path = cmSystemTools::FindProgram(filename.c_str()); + std::string path = cmSystemTools::FindProgram(filename.c_str()); if (!path.empty()) { resultingConfig.clear(); return path; diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx index 970564de9f..1a3aab8f83 100644 --- a/Source/cmSetPropertyCommand.cxx +++ b/Source/cmSetPropertyCommand.cxx @@ -189,7 +189,7 @@ std::string MakeSourceFilePathAbsoluteIfNeeded( if (!needed) { return source_file_path; } - const std::string absolute_file_path = cmSystemTools::CollapseFullPath( + std::string absolute_file_path = cmSystemTools::CollapseFullPath( source_file_path, status.GetMakefile().GetCurrentSourceDirectory()); return absolute_file_path; } |