12 files changed, 33 insertions, 36 deletions
diff --git a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
index d4f628cb93..4b178759d6 100644
--- a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
+++ b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
@@ -12,20 +12,17 @@ std::wstring get_property(MSIHANDLE msi_handle, std::wstring const& name)
 
   UINT status = MsiGetPropertyW(msi_handle, name.c_str(), L"", &size);
 
-  if(status == ERROR_MORE_DATA)
-    {
+  if (status == ERROR_MORE_DATA) {
     std::vector<wchar_t> buffer(size + 1);
     MsiGetPropertyW(msi_handle, name.c_str(), &buffer[0], &size);
     return std::wstring(&buffer[0]);
-    }
-  else
-    {
+  } else {
     return std::wstring();
-    }
+  }
 }
 
-void set_property(MSIHANDLE msi_handle,
-  std::wstring const& name, std::wstring const& value)
+void set_property(MSIHANDLE msi_handle, std::wstring const& name,
+                  std::wstring const& value)
 {
   MsiSetPropertyW(msi_handle, name.c_str(), value.c_str());
 }
@@ -37,10 +34,10 @@ extern "C" UINT __stdcall DetectNsisOverwrite(MSIHANDLE msi_handle)
   std::wstring uninstall_exe = install_root + L"\\uninstall.exe";
 
   bool uninstall_exe_exists =
-      GetFileAttributesW(uninstall_exe.c_str()) != INVALID_FILE_ATTRIBUTES;
+    GetFileAttributesW(uninstall_exe.c_str()) != INVALID_FILE_ATTRIBUTES;
 
   set_property(msi_handle, L"CMAKE_NSIS_OVERWRITE_DETECTED",
-    uninstall_exe_exists ? L"1" : L"0");
+               uninstall_exe_exists ? L"1" : L"0");
 
   return ERROR_SUCCESS;
 }
diff --git a/Utilities/cm_bzlib.h b/Utilities/cm_bzlib.h
index 567802561b..0eb7bd891c 100644
--- a/Utilities/cm_bzlib.h
+++ b/Utilities/cm_bzlib.h
@@ -15,9 +15,9 @@
 /* Use the bzip2 library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_BZIP2
-# include <bzlib.h>
+#include <bzlib.h>
 #else
-# include <cmbzip2/bzlib.h>
+#include <cmbzip2/bzlib.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_curl.h b/Utilities/cm_curl.h
index c9835e73a0..bf4c63cfbb 100644
--- a/Utilities/cm_curl.h
+++ b/Utilities/cm_curl.h
@@ -15,9 +15,9 @@
 /* Use the curl library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_CURL
-# include <curl/curl.h>
+#include <curl/curl.h>
 #else
-# include <cmcurl/include/curl/curl.h>
+#include <cmcurl/include/curl/curl.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_expat.h b/Utilities/cm_expat.h
index d35e10650e..c6c66832e9 100644
--- a/Utilities/cm_expat.h
+++ b/Utilities/cm_expat.h
@@ -15,9 +15,9 @@
 /* Use the expat library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_EXPAT
-# include <expat.h>
+#include <expat.h>
 #else
-# include <cmexpat/lib/expat.h>
+#include <cmexpat/lib/expat.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_jsoncpp_reader.h b/Utilities/cm_jsoncpp_reader.h
index 22f2d81152..019044e1c7 100644
--- a/Utilities/cm_jsoncpp_reader.h
+++ b/Utilities/cm_jsoncpp_reader.h
@@ -15,9 +15,9 @@
 /* Use the jsoncpp library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_JSONCPP
-# include <json/reader.h>
+#include <json/reader.h>
 #else
-# include <cmjsoncpp/include/json/reader.h>
+#include <cmjsoncpp/include/json/reader.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_jsoncpp_value.h b/Utilities/cm_jsoncpp_value.h
index b4cf620579..81c9ae0494 100644
--- a/Utilities/cm_jsoncpp_value.h
+++ b/Utilities/cm_jsoncpp_value.h
@@ -15,9 +15,9 @@
 /* Use the jsoncpp library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_JSONCPP
-# include <json/value.h>
+#include <json/value.h>
 #else
-# include <cmjsoncpp/include/json/value.h>
+#include <cmjsoncpp/include/json/value.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_jsoncpp_writer.h b/Utilities/cm_jsoncpp_writer.h
index c99a0d0902..597539d943 100644
--- a/Utilities/cm_jsoncpp_writer.h
+++ b/Utilities/cm_jsoncpp_writer.h
@@ -15,9 +15,9 @@
 /* Use the jsoncpp library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_JSONCPP
-# include <json/writer.h>
+#include <json/writer.h>
 #else
-# include <cmjsoncpp/include/json/writer.h>
+#include <cmjsoncpp/include/json/writer.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_kwiml.h b/Utilities/cm_kwiml.h
index ab2b80b3cf..fce888181a 100644
--- a/Utilities/cm_kwiml.h
+++ b/Utilities/cm_kwiml.h
@@ -15,11 +15,11 @@
 /* Use the KWIML library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_KWIML
-# include <kwiml/abi.h>
-# include <kwiml/int.h>
+#include <kwiml/abi.h>
+#include <kwiml/int.h>
 #else
-# include "KWIML/include/kwiml/abi.h"
-# include "KWIML/include/kwiml/int.h"
+#include "KWIML/include/kwiml/abi.h"
+#include "KWIML/include/kwiml/int.h"
 #endif
 
 #endif
diff --git a/Utilities/cm_libarchive.h b/Utilities/cm_libarchive.h
index 0f18c91a86..c6a8a82478 100644
--- a/Utilities/cm_libarchive.h
+++ b/Utilities/cm_libarchive.h
@@ -15,11 +15,11 @@
 /* Use the libarchive configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_LIBARCHIVE
-# include <archive.h>
-# include <archive_entry.h>
+#include <archive.h>
+#include <archive_entry.h>
 #else
-# include <cmlibarchive/libarchive/archive.h>
-# include <cmlibarchive/libarchive/archive_entry.h>
+#include <cmlibarchive/libarchive/archive.h>
+#include <cmlibarchive/libarchive/archive_entry.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_lzma.h b/Utilities/cm_lzma.h
index 02d7e4fd45..20cf1d7a9d 100644
--- a/Utilities/cm_lzma.h
+++ b/Utilities/cm_lzma.h
@@ -15,9 +15,9 @@
 /* Use the liblzma configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_LIBLZMA
-# include <lzma.h>
+#include <lzma.h>
 #else
-# include <cmliblzma/liblzma/api/lzma.h>
+#include <cmliblzma/liblzma/api/lzma.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_xmlrpc.h b/Utilities/cm_xmlrpc.h
index ac461f9dba..0bc93f44db 100644
--- a/Utilities/cm_xmlrpc.h
+++ b/Utilities/cm_xmlrpc.h
@@ -15,8 +15,8 @@
 /* Use the xmlrpc library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CTEST_USE_XMLRPC
-# include <xmlrpc.h>
-# include <xmlrpc_client.h>
+#include <xmlrpc.h>
+#include <xmlrpc_client.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_zlib.h b/Utilities/cm_zlib.h
index 1b5c06e7e7..6ff8e6c6d1 100644
--- a/Utilities/cm_zlib.h
+++ b/Utilities/cm_zlib.h
@@ -15,9 +15,9 @@
 /* Use the zlib library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_ZLIB
-# include <zlib.h>
+#include <zlib.h>
 #else
-# include <cmzlib/zlib.h>
+#include <cmzlib/zlib.h>
 #endif
 
 #endif