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/cmQtAutoGenInitializer.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/cmQtAutoGenInitializer.cxx')
-rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 8aa5f20..d21fc61 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -294,11 +294,9 @@ bool cmQtAutoGenInitializer::InitCustomTargets() // Info directory this->Dir.Info = cbd; - this->Dir.Info += "/CMakeFiles"; - this->Dir.Info += '/'; + this->Dir.Info += "/CMakeFiles/"; this->Dir.Info += this->Target->GetName(); - this->Dir.Info += "_autogen"; - this->Dir.Info += ".dir"; + this->Dir.Info += "_autogen.dir"; cmSystemTools::ConvertToUnixSlashes(this->Dir.Info); // Build directory |