diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 10:34:04 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 16:05:19 -0400 |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmFindPackageCommand.h | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | cmake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Source/cmFindPackageCommand.h')
-rw-r--r-- | Source/cmFindPackageCommand.h | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h index 8bfd4051ee..eff6b80901 100644 --- a/Source/cmFindPackageCommand.h +++ b/Source/cmFindPackageCommand.h @@ -29,17 +29,14 @@ public: /** * This is a virtual constructor for the command. */ - virtual cmCommand* Clone() - { - return new cmFindPackageCommand; - } + virtual cmCommand* Clone() { return new cmFindPackageCommand; } /** * This is called when the command is first encountered in * the CMakeLists.txt file. */ virtual bool InitialPass(std::vector<std::string> const& args, - cmExecutionStatus &status); + cmExecutionStatus& status); /** * This determines if the command is invoked when in script mode. @@ -49,16 +46,21 @@ public: /** * The name of the command as specified in CMakeList.txt. */ - virtual std::string GetName() const { return "find_package";} + virtual std::string GetName() const { return "find_package"; } cmTypeMacro(cmFindPackageCommand, cmFindCommon); + private: class PathLabel : public cmFindCommon::PathLabel { protected: PathLabel(); + public: - PathLabel(const std::string& label) : cmFindCommon::PathLabel(label) { } + PathLabel(const std::string& label) + : cmFindCommon::PathLabel(label) + { + } static PathLabel UserRegistry; static PathLabel Builds; static PathLabel SystemRegistry; @@ -79,7 +81,11 @@ private: bool FindPrefixedConfig(); bool FindFrameworkConfig(); bool FindAppBundleConfig(); - enum PolicyScopeRule { NoPolicyScope, DoPolicyScope }; + enum PolicyScopeRule + { + NoPolicyScope, + DoPolicyScope + }; bool ReadListFile(const char* f, PolicyScopeRule psr); void StoreVersionFound(); @@ -111,7 +117,11 @@ private: friend class cmFindPackageFileList; - struct OriginalDef { bool exists; std::string value; }; + struct OriginalDef + { + bool exists; + std::string value; + }; std::map<std::string, OriginalDef> OriginalDefs; std::string Name; @@ -145,7 +155,11 @@ private: std::vector<std::string> Configs; std::set<std::string> IgnoredPaths; - struct ConfigFileInfo { std::string filename; std::string version; }; + struct ConfigFileInfo + { + std::string filename; + std::string version; + }; std::vector<ConfigFileInfo> ConsideredConfigs; }; |