mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-24 07:08:38 -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:
@@ -6,9 +6,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
|
||||
|
||||
+2
-2
@@ -6,9 +6,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
|
||||
|
||||
@@ -6,9 +6,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
|
||||
|
||||
@@ -6,9 +6,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
|
||||
|
||||
@@ -6,9 +6,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
|
||||
|
||||
@@ -6,9 +6,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
|
||||
|
||||
@@ -6,11 +6,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
|
||||
|
||||
@@ -6,11 +6,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
|
||||
|
||||
+2
-2
@@ -6,9 +6,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
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
/* Use the LibRHash library configured for CMake. */
|
||||
#include "cmThirdParty.h"
|
||||
#ifdef CMAKE_USE_SYSTEM_LIBRHASH
|
||||
#include <rhash.h>
|
||||
# include <rhash.h>
|
||||
#else
|
||||
#include <cmlibrhash/librhash/rhash.h>
|
||||
# include <cmlibrhash/librhash/rhash.h>
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
+2
-2
@@ -6,9 +6,9 @@
|
||||
/* Use the libuv library configured for CMake. */
|
||||
#include "cmThirdParty.h"
|
||||
#ifdef CMAKE_USE_SYSTEM_LIBUV
|
||||
#include <uv.h>
|
||||
# include <uv.h>
|
||||
#else
|
||||
#include <cmlibuv/include/uv.h>
|
||||
# include <cmlibuv/include/uv.h>
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -6,8 +6,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
|
||||
|
||||
+2
-2
@@ -6,9 +6,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
|
||||
|
||||
Reference in New Issue
Block a user