diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-19 12:55:18 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-19 12:55:18 (GMT) |
| commit | 995d6be1282cb1f7c92bb136be10163a704e7d10 (patch) | |
| tree | dc1842c4b1d49813dbc9166fdedacefe26433fc0 /Source/cmFindLibraryCommand.cxx | |
| parent | 31d63ac88c32c6313570777a6c18bad88b88d502 (diff) | |
| parent | 3fab1fef23476b27274cddf4bb8f6cbe8d36c712 (diff) | |
| download | CMake-995d6be1282cb1f7c92bb136be10163a704e7d10.zip CMake-995d6be1282cb1f7c92bb136be10163a704e7d10.tar.gz CMake-995d6be1282cb1f7c92bb136be10163a704e7d10.tar.bz2 | |
Merge topic 'clang-tidy-fixes'
3fab1fef cmNinjaNormalTargetGenerator: make sure comments match parameter names
7b94a7ad cmCommandArgumentsHelper: simplify boolean expression
782fcbb9 Use CM_NULLPTR
809ca6c8 Use braces around statements
516f8edb Avoid else after return
d9f5d3c5 Remove redundant get() call on smart pointer
3fda1094 Mark overridden functions with CM_OVERRIDE
Diffstat (limited to 'Source/cmFindLibraryCommand.cxx')
| -rw-r--r-- | Source/cmFindLibraryCommand.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx index 3094fcf..0fd56b5 100644 --- a/Source/cmFindLibraryCommand.cxx +++ b/Source/cmFindLibraryCommand.cxx @@ -378,9 +378,8 @@ std::string cmFindLibraryCommand::FindNormalLibrary() { if (this->NamesPerDir) { return this->FindNormalLibraryNamesPerDir(); - } else { - return this->FindNormalLibraryDirsPerName(); } + return this->FindNormalLibraryDirsPerName(); } std::string cmFindLibraryCommand::FindNormalLibraryNamesPerDir() @@ -428,9 +427,8 @@ std::string cmFindLibraryCommand::FindFrameworkLibrary() { if (this->NamesPerDir) { return this->FindFrameworkLibraryNamesPerDir(); - } else { - return this->FindFrameworkLibraryDirsPerName(); } + return this->FindFrameworkLibraryDirsPerName(); } std::string cmFindLibraryCommand::FindFrameworkLibraryNamesPerDir() |