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/cmGlobalVisualStudio10Generator.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/cmGlobalVisualStudio10Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 720b6c5..02d25fb 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -1038,8 +1038,7 @@ std::string cmGlobalVisualStudio10Generator::GenerateRuleFile( // The VS 10 generator needs to create the .rule files on disk. // Hide them away under the CMakeFiles directory. std::string ruleDir = this->GetCMakeInstance()->GetHomeOutputDirectory(); - ruleDir += "/CMakeFiles"; - ruleDir += "/"; + ruleDir += "/CMakeFiles/"; ruleDir += cmSystemTools::ComputeStringMD5( cmSystemTools::GetFilenamePath(output).c_str()); std::string ruleFile = ruleDir + "/"; |