diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-19 19:05:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-19 19:06:47 (GMT) |
| commit | 5f7386dd19c27690a1187a69f0861faf51899264 (patch) | |
| tree | 3d7a2453a1238709beea1456acb7b33c4706f9ad /Source/cmFileCommand.cxx | |
| parent | 0b8524baa68944ee148c8b48b4ee937ab315175d (diff) | |
| parent | da26b3be8948471dd2320d1e44af9eb5dfaa0f6a (diff) | |
| download | CMake-5f7386dd19c27690a1187a69f0861faf51899264.zip CMake-5f7386dd19c27690a1187a69f0861faf51899264.tar.gz CMake-5f7386dd19c27690a1187a69f0861faf51899264.tar.bz2 | |
Merge topic 'string-literal-append'
da26b3be89 avoid adding multiple consecutive string literals to std::string
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3698
Diffstat (limited to 'Source/cmFileCommand.cxx')
| -rw-r--r-- | Source/cmFileCommand.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 67ae1e6..4f7eaea 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -469,8 +469,7 @@ bool HandleStringsCommand(std::vector<std::string> const& args, // TODO: should work without temp file, but just on a memory buffer std::string binaryFileName = status.GetMakefile().GetCurrentBinaryDirectory(); - binaryFileName += "/CMakeFiles"; - binaryFileName += "/FileCommandStringsBinaryFile"; + binaryFileName += "/CMakeFiles/FileCommandStringsBinaryFile"; if (cmHexFileConverter::TryConvert(fileName, binaryFileName)) { fileName = binaryFileName; } |