[CMake] clang-tools-extra: Update dependencies.

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@196860 91177308-0d34-0410-b5e6-96231b3b80d8

clang-apply-replacements/CMakeLists.txt

@@ -6,10 +6,9 @@ add_clang_library(clangApplyReplacements
   lib/Tooling/ApplyReplacements.cpp
   )
 target_link_libraries(clangApplyReplacements
-  clangTooling
   clangBasic
-  clangRewriteFrontend
-  clangFormat
+  clangRewriteCore
+  clangTooling
   )
 
 include_directories(

clang-apply-replacements/tool/CMakeLists.txt

@@ -7,6 +7,10 @@ add_clang_executable(clang-apply-replacements
   )
 target_link_libraries(clang-apply-replacements
   clangApplyReplacements
+  clangBasic
+  clangFormat
+  clangRewriteCore
+  clangTooling
   )
 
 install(TARGETS clang-apply-replacements

clang-modernize/Core/CMakeLists.txt

@@ -9,9 +9,10 @@ add_clang_library(modernizeCore
   IncludeDirectives.cpp
   )
 target_link_libraries(modernizeCore
-  clangFormat
-  clangTooling
-  clangBasic
+  clangAST
   clangASTMatchers
-  clangRewriteFrontend
+  clangBasic
+  clangFrontend
+  clangLex
+  clangTooling
   )

clang-modernize/tool/CMakeLists.txt

@@ -34,6 +34,13 @@ add_dependencies(clang-modernize
   )
 
 target_link_libraries(clang-modernize
+  clangAST
+  clangASTMatchers
+  clangBasic
+  clangFormat
+  clangFrontend
+  clangLex
+  clangTooling
   modernizeCore
   )
 

clang-query/CMakeLists.txt

@@ -1,3 +1,7 @@
+set(LLVM_LINK_COMPONENTS
+  Support
+  )
+
 add_clang_library(clangQuery
   Query.cpp
   QueryParser.cpp

clang-tidy/CMakeLists.txt

@@ -7,11 +7,13 @@ add_clang_library(clangTidy
   ClangTidyModule.cpp
   )
 target_link_libraries(clangTidy
-  clangTooling
+  clangAST
+  clangASTMatchers
   clangBasic
-  clangRewriteFrontend
+  clangFrontend
+  clangRewriteCore
   clangStaticAnalyzerFrontend
-  clangStaticAnalyzerCheckers
+  clangTooling
   )
 
 add_subdirectory(tool)

clang-tidy/google/CMakeLists.txt

@@ -4,8 +4,8 @@ add_clang_library(clangTidyGoogleModule
   GoogleTidyModule.cpp
   )
 target_link_libraries(clangTidyGoogleModule
-  clangTidy
-  clangTooling
-  clangBasic
+  clangAST
   clangASTMatchers
+  clangBasic
+  clangTidy
   )

clang-tidy/llvm/CMakeLists.txt

@@ -4,8 +4,9 @@ add_clang_library(clangTidyLLVMModule
   LLVMTidyModule.cpp
   )
 target_link_libraries(clangTidyLLVMModule
-  clangTidy
-  clangTooling
-  clangBasic
+  clangAST
   clangASTMatchers
+  clangBasic
+  clangLex
+  clangTidy
   )

clang-tidy/tool/CMakeLists.txt

@@ -6,10 +6,12 @@ add_clang_executable(clang-tidy
   ClangTidyMain.cpp
   )
 target_link_libraries(clang-tidy
+  clangAST
+  clangASTMatchers
   clangTidy
-  clangTidyLLVMModule
   clangTidyGoogleModule
-  clangStaticAnalyzerCheckers
+  clangTidyLLVMModule
+  clangTooling
   )
 
 install(TARGETS clang-tidy

modularize/CMakeLists.txt

@@ -10,7 +10,9 @@ add_clang_executable(modularize
   )
 
 target_link_libraries(modularize
-  clangTooling
   clangBasic
-  clangRewriteFrontend
+  clangDriver
+  clangFrontend
+  clangLex
+  clangTooling
   )

pp-trace/CMakeLists.txt

@@ -8,8 +8,9 @@ add_clang_executable(pp-trace
   )
 
 target_link_libraries(pp-trace
+  clangAST
+  clangBasic
+  clangFrontend
   clangLex
-  clangParse
-  clangSema
   clangTooling
   )

remove-cstr-calls/CMakeLists.txt

@@ -1,6 +1,16 @@
+set(LLVM_LINK_COMPONENTS
+  Support
+  )
+
 add_clang_executable(remove-cstr-calls
   RemoveCStrCalls.cpp
   )
 
 target_link_libraries(remove-cstr-calls
-  clangEdit clangTooling clangBasic clangAST clangASTMatchers)
+  clangAST
+  clangASTMatchers
+  clangBasic
+  clangFrontend
+  clangLex
+  clangTooling
+  )

tool-template/CMakeLists.txt

@@ -1,6 +1,15 @@
+set(LLVM_LINK_COMPONENTS
+  Support
+  )
+
 add_clang_executable(tool-template
   ToolTemplate.cpp
   )
 
 target_link_libraries(tool-template
-  clangEdit clangTooling clangBasic clangAST clangASTMatchers)
+  clangAST
+  clangASTMatchers
+  clangBasic
+  clangFrontend
+  clangTooling
+  )

unittests/clang-apply-replacements/CMakeLists.txt

@@ -1,10 +1,3 @@
-set(LLVM_LINK_COMPONENTS
-  asmparser
-  bitreader
-  support
-  mc
-  )
-
 get_filename_component(ClangApplyReplacementsLocation
   "${CMAKE_CURRENT_SOURCE_DIR}/../../clang-apply-replacements/include" REALPATH)
 get_filename_component(CommonIncLocation
@@ -20,4 +13,5 @@ add_extra_unittest(ClangApplyReplacementsTests
 
 target_link_libraries(ClangApplyReplacementsTests
   clangApplyReplacements
+  clangTooling
   )

unittests/clang-modernize/CMakeLists.txt

@@ -23,10 +23,10 @@ add_extra_unittest(ClangModernizeTests
   )
 
 target_link_libraries(ClangModernizeTests
-  modernizeCore
-  clangFormat
-  clangTooling
-  clangBasic
+  clangAST
   clangASTMatchers
-  clangRewriteFrontend
+  clangBasic
+  clangFrontend
+  clangTooling
+  modernizeCore
   )

unittests/clang-query/CMakeLists.txt

@@ -12,6 +12,7 @@ add_extra_unittest(ClangQueryTests
   )
 
 target_link_libraries(ClangQueryTests
+  clangAST
   clangASTMatchers
   clangQuery
   clangTooling

unittests/clang-tidy/CMakeLists.txt

@@ -11,12 +11,12 @@ add_extra_unittest(ClangTidyTests
   GoogleModuleTest.cpp)
 
 target_link_libraries(ClangTidyTests
-  gtest
-  gtest_main
-  clangTidy
-  clangTidyLLVMModule
-  clangTidyGoogleModule
-  clangTooling
-  clangBasic
+  clangAST
   clangASTMatchers
+  clangBasic
+  clangFrontend
+  clangTidy
+  clangTidyGoogleModule
+  clangTidyLLVMModule
+  clangTooling
   )