diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-01 16:52:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-01 16:52:38 (GMT) |
| commit | eed0df951d95d48e7856107175a2baba212c3206 (patch) | |
| tree | d9ac3ded5ae6899be7188795011743fe3e6da0a6 /Source/cmExportCommand.cxx | |
| parent | b671e4799f0e418448681a21120e8e87a97de5dc (diff) | |
| parent | d7204e649ed4ebb19bb341b4e49eb51514364922 (diff) | |
| download | CMake-eed0df951d95d48e7856107175a2baba212c3206.zip CMake-eed0df951d95d48e7856107175a2baba212c3206.tar.gz CMake-eed0df951d95d48e7856107175a2baba212c3206.tar.bz2 | |
Merge topic 'clang-format-6.0'
d7204e649e Revise C++ coding style using clang-format-6.0
12fed3edb1 Empty commit at end of history preceding clang-format-6.0 style transition
523c443d13 clang-format.bash: update to clang-format-6.0
eb7ec19c1c clang-format: Add comments to suppress some formatting
b67a5bf175 Tests/VSWinStorePhone: Do not format managed source
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@xwmw.org>
Merge-request: !2123
Diffstat (limited to 'Source/cmExportCommand.cxx')
| -rw-r--r-- | Source/cmExportCommand.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index 655ebe8..4e1d771 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -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; |