diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-02 13:19:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-02 13:19:37 (GMT) |
| commit | 78d1a2d0bbda1798ffc71b11a181d376914bdc3c (patch) | |
| tree | d9c01f2146c5e9beeb354cf26f9ceacea6fdf3dc /Source/cmFindPackageCommand.cxx | |
| parent | 0a082be80086931557df57a7171e80187ddf8aa8 (diff) | |
| parent | db2d46e2ddbdf1c5d942e70b341e085f84e79c13 (diff) | |
| download | CMake-78d1a2d0bbda1798ffc71b11a181d376914bdc3c.zip CMake-78d1a2d0bbda1798ffc71b11a181d376914bdc3c.tar.gz CMake-78d1a2d0bbda1798ffc71b11a181d376914bdc3c.tar.bz2 | |
Merge topic 'string-npos-cleanup'
db2d46e2 Remove second arg: npos in substr usages
8b6f439e Access string npos without instance
389ed56f cmLocalUnixMakefileGenerator3: Remove unnecessary local variable
9fe4a9e2 cmParseBlanketJSCoverage: Pass unmodified parameter as const&
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !905
Diffstat (limited to 'Source/cmFindPackageCommand.cxx')
| -rw-r--r-- | Source/cmFindPackageCommand.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index f67f353..21ca347 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -326,7 +326,7 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args, } else if (doing == DoingPathSuffixes) { this->AddPathSuffix(args[i]); } else if (doing == DoingConfigs) { - if (args[i].find_first_of(":/\\") != args[i].npos || + if (args[i].find_first_of(":/\\") != std::string::npos || cmSystemTools::GetFilenameLastExtension(args[i]) != ".cmake") { std::ostringstream e; e << "given CONFIGS option followed by invalid file name \"" << args[i] @@ -1593,6 +1593,7 @@ class cmFileListGeneratorBase { public: virtual ~cmFileListGeneratorBase() {} + protected: bool Consider(std::string const& fullPath, cmFileList& listing); |