diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-23 13:00:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-23 13:00:00 (GMT) |
| commit | 797f7ad87d6f1b6dd7cbbb553d5525ac8ee390f1 (patch) | |
| tree | f5922b06caf987f6faff13f8c2ba8e0f164457f6 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 762131fe8d585ced6b259a451ccde8fded2a8ca4 (diff) | |
| parent | 7b6349da4dc968691f1a374211fcc153c8b4f1c6 (diff) | |
| download | CMake-797f7ad87d6f1b6dd7cbbb553d5525ac8ee390f1.zip CMake-797f7ad87d6f1b6dd7cbbb553d5525ac8ee390f1.tar.gz CMake-797f7ad87d6f1b6dd7cbbb553d5525ac8ee390f1.tar.bz2 | |
Merge topic 'else-after-return'
7b6349da CMake: don't use else after return
50ad1e0a CTest: don't use else after return
7f97a6c9 CPack: don't use else after return
4988b914 CursesDialog: don't use else after return
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 3b8aaa6..2b83479 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -93,12 +93,11 @@ std::string cmGlobalNinjaGenerator::EncodeIdent(const std::string& ident, names << "ident" << VarNum++; vars << names.str() << " = " << ident << "\n"; return "$" + names.str(); - } else { - std::string result = ident; - cmSystemTools::ReplaceString(result, " ", "$ "); - cmSystemTools::ReplaceString(result, ":", "$:"); - return result; } + std::string result = ident; + cmSystemTools::ReplaceString(result, " ", "$ "); + cmSystemTools::ReplaceString(result, ":", "$:"); + return result; } std::string cmGlobalNinjaGenerator::EncodeLiteral(const std::string& lit) |