diff options
author | Eric Liu <ioeric@google.com> | 2018-05-30 11:51:48 +0000 |
---|---|---|
committer | Eric Liu <ioeric@google.com> | 2018-05-30 11:51:48 +0000 |
commit | f311608c6cbf4e90fa2fb2e2ddbf440e25947edb (patch) | |
tree | f25790e1bedfa78825a1988143393176f35e9d09 /lib | |
parent | c6bd6cda63ff7f14021b205670609d5971943986 (diff) | |
download | clang-f311608c6cbf4e90fa2fb2e2ddbf440e25947edb.tar.gz |
Reland "Move #include manipulation code to new lib/Tooling/Inclusions."
This reverts commit r332751 (i.e. reland r332720) after fixing module
build.
Differential Revision: https://reviews.llvm.org/D47068
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@333532 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Format/CMakeLists.txt | 1 | ||||
-rw-r--r-- | lib/Format/Format.cpp | 2 | ||||
-rw-r--r-- | lib/Tooling/CMakeLists.txt | 1 | ||||
-rw-r--r-- | lib/Tooling/Core/CMakeLists.txt | 2 | ||||
-rw-r--r-- | lib/Tooling/Inclusions/CMakeLists.txt | 12 | ||||
-rw-r--r-- | lib/Tooling/Inclusions/HeaderIncludes.cpp (renamed from lib/Tooling/Core/HeaderIncludes.cpp) | 2 | ||||
-rw-r--r-- | lib/Tooling/Inclusions/IncludeStyle.cpp (renamed from lib/Tooling/Core/IncludeStyle.cpp) | 3 |
7 files changed, 17 insertions, 6 deletions
diff --git a/lib/Format/CMakeLists.txt b/lib/Format/CMakeLists.txt index 42e6d53d9f..0019d045cd 100644 --- a/lib/Format/CMakeLists.txt +++ b/lib/Format/CMakeLists.txt @@ -20,4 +20,5 @@ add_clang_library(clangFormat clangBasic clangLex clangToolingCore + clangToolingInclusions ) diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index c6de92b3ca..d1a5dc8e6c 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -31,7 +31,7 @@ #include "clang/Basic/SourceManager.h" #include "clang/Basic/VirtualFileSystem.h" #include "clang/Lex/Lexer.h" -#include "clang/Tooling/Core/HeaderIncludes.h" +#include "clang/Tooling/Inclusions/HeaderIncludes.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Allocator.h" diff --git a/lib/Tooling/CMakeLists.txt b/lib/Tooling/CMakeLists.txt index eaae49b431..031d8b51de 100644 --- a/lib/Tooling/CMakeLists.txt +++ b/lib/Tooling/CMakeLists.txt @@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS ) add_subdirectory(Core) +add_subdirectory(Inclusions) add_subdirectory(Refactoring) add_subdirectory(ASTDiff) diff --git a/lib/Tooling/Core/CMakeLists.txt b/lib/Tooling/Core/CMakeLists.txt index 84d17984b4..f7f423c522 100644 --- a/lib/Tooling/Core/CMakeLists.txt +++ b/lib/Tooling/Core/CMakeLists.txt @@ -2,8 +2,6 @@ set(LLVM_LINK_COMPONENTS support) add_clang_library(clangToolingCore Diagnostic.cpp - HeaderIncludes.cpp - IncludeStyle.cpp Lookup.cpp Replacement.cpp diff --git a/lib/Tooling/Inclusions/CMakeLists.txt b/lib/Tooling/Inclusions/CMakeLists.txt new file mode 100644 index 0000000000..00afb50f3a --- /dev/null +++ b/lib/Tooling/Inclusions/CMakeLists.txt @@ -0,0 +1,12 @@ +set(LLVM_LINK_COMPONENTS support) + +add_clang_library(clangToolingInclusions + HeaderIncludes.cpp + IncludeStyle.cpp + + LINK_LIBS + clangBasic + clangLex + clangRewrite + clangToolingCore + ) diff --git a/lib/Tooling/Core/HeaderIncludes.cpp b/lib/Tooling/Inclusions/HeaderIncludes.cpp index d974d16f01..99c0866a68 100644 --- a/lib/Tooling/Core/HeaderIncludes.cpp +++ b/lib/Tooling/Inclusions/HeaderIncludes.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Tooling/Core/HeaderIncludes.h" +#include "clang/Tooling/Inclusions/HeaderIncludes.h" #include "clang/Basic/SourceManager.h" #include "clang/Lex/Lexer.h" diff --git a/lib/Tooling/Core/IncludeStyle.cpp b/lib/Tooling/Inclusions/IncludeStyle.cpp index 74eec481c2..3597710f1f 100644 --- a/lib/Tooling/Core/IncludeStyle.cpp +++ b/lib/Tooling/Inclusions/IncludeStyle.cpp @@ -7,8 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Tooling/Core/IncludeStyle.h" - +#include "clang/Tooling/Inclusions/IncludeStyle.h" using clang::tooling::IncludeStyle; |