mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-07 06:40:16 -05:00
Revise C++ coding style using clang-format-6.0
Run the `clang-format.bash` script to update all our C and C++ code to a new style defined by `.clang-format`. Use `clang-format` version 6.0. * 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.
This commit is contained in:
@@ -20,8 +20,8 @@
|
||||
class cmExecutionStatus;
|
||||
|
||||
#if defined(__HAIKU__)
|
||||
#include <FindDirectory.h>
|
||||
#include <StorageDefs.h>
|
||||
# include <FindDirectory.h>
|
||||
# include <StorageDefs.h>
|
||||
#endif
|
||||
|
||||
cmExportCommand::cmExportCommand()
|
||||
@@ -266,7 +266,7 @@ bool cmExportCommand::HandlePackage(std::vector<std::string> const& args)
|
||||
}
|
||||
|
||||
#if defined(_WIN32) && !defined(__CYGWIN__)
|
||||
#include <windows.h>
|
||||
# include <windows.h>
|
||||
|
||||
void cmExportCommand::ReportRegistryError(std::string const& msg,
|
||||
std::string const& key, long err)
|
||||
@@ -317,7 +317,7 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package,
|
||||
const char* content,
|
||||
const char* hash)
|
||||
{
|
||||
#if defined(__HAIKU__)
|
||||
# if defined(__HAIKU__)
|
||||
char dir[B_PATH_NAME_LENGTH];
|
||||
if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) !=
|
||||
B_OK) {
|
||||
@@ -326,7 +326,7 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package,
|
||||
std::string fname = dir;
|
||||
fname += "/cmake/packages/";
|
||||
fname += package;
|
||||
#else
|
||||
# else
|
||||
std::string fname;
|
||||
if (!cmSystemTools::GetEnv("HOME", fname)) {
|
||||
return;
|
||||
@@ -334,7 +334,7 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package,
|
||||
cmSystemTools::ConvertToUnixSlashes(fname);
|
||||
fname += "/.cmake/packages/";
|
||||
fname += package;
|
||||
#endif
|
||||
# endif
|
||||
cmSystemTools::MakeDirectory(fname);
|
||||
fname += "/";
|
||||
fname += hash;
|
||||
|
||||
Reference in New Issue
Block a user