[CMake] Update target_link_libraries() and LLVM_LINK_COMPONENTS for each CMakeLists...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@196916 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/examples/PrintFunctionNames/CMakeLists.txt b/examples/PrintFunctionNames/CMakeLists.txt
index ba6a350cd95403ce5ced275ef89bb82bfaf25a93..492b580c0ea6c344d4614e4f695c16ba7c92b493 100644 (file)
--- a/examples/PrintFunctionNames/CMakeLists.txt
+++ b/examples/PrintFunctionNames/CMakeLists.txt
@@ -1,6 +1,8 @@
 set(MODULE TRUE)
 
-set( LLVM_LINK_COMPONENTS support mc)
+set( LLVM_LINK_COMPONENTS
+  Support
+  )
 
 add_clang_library(PrintFunctionNames PrintFunctionNames.cpp)
 
@@ -14,8 +16,9 @@ add_dependencies(PrintFunctionNames
   )
 
 target_link_libraries(PrintFunctionNames
-  clangFrontend
   clangAST
+  clangBasic
+  clangFrontend
   )
 
 set_target_properties(PrintFunctionNames

diff --git a/examples/analyzer-plugin/CMakeLists.txt b/examples/analyzer-plugin/CMakeLists.txt
index ba73030cc37b65a0072868e4343277ef8496279f..fa8c4fcb3202da9f808ceca70de53f7e08ae18fa 100644 (file)
--- a/examples/analyzer-plugin/CMakeLists.txt
+++ b/examples/analyzer-plugin/CMakeLists.txt
@@ -1,6 +1,8 @@
 set(MODULE TRUE)
 
-set( LLVM_LINK_COMPONENTS support mc)
+set(LLVM_LINK_COMPONENTS
+  Support
+  )
 
 add_clang_library(SampleAnalyzerPlugin MainCallChecker.cpp)
 
@@ -14,6 +16,8 @@ add_dependencies(SampleAnalyzerPlugin
   )
 
 target_link_libraries(SampleAnalyzerPlugin
+  clangAST
+  clangAnalysis
   clangStaticAnalyzerCore
   )
 

diff --git a/examples/clang-interpreter/CMakeLists.txt b/examples/clang-interpreter/CMakeLists.txt
index 451b4b8672224002d8c1c8b4a6a209946a832a01..10df7e7e06076f6d6d4828079189dfbd985338a3 100644 (file)
--- a/examples/clang-interpreter/CMakeLists.txt
+++ b/examples/clang-interpreter/CMakeLists.txt
@@ -1,15 +1,9 @@
 set(LLVM_LINK_COMPONENTS
-  jit
-  interpreter
+  Core
+  ExecutionEngine
+  JIT
+  Support
   nativecodegen
-  asmparser
-  bitreader
-  bitwriter
-  irreader
-  codegen
-  ipo
-  linker
-  selectiondag
   )
 
 add_clang_executable(clang-interpreter
@@ -21,19 +15,8 @@ add_dependencies(clang-interpreter
   )
 
 target_link_libraries(clang-interpreter
-  clangFrontend
-  clangSerialization
-  clangDriver
-  clangCodeGen
-  clangSema
-  clangStaticAnalyzerFrontend
-  clangStaticAnalyzerCheckers
-  clangStaticAnalyzerCore
-  clangAnalysis
-  clangRewriteCore
-  clangRewriteFrontend
-  clangAST
-  clangParse
-  clangLex
   clangBasic
+  clangCodeGen
+  clangDriver
+  clangFrontend
   )

diff --git a/tools/c-arcmt-test/CMakeLists.txt b/tools/c-arcmt-test/CMakeLists.txt
index 1e72261b2192affdad8a200d281f839c904667f9..9014ccc309f2552fa8e07a9f8301eaa05f568657 100644 (file)
--- a/tools/c-arcmt-test/CMakeLists.txt
+++ b/tools/c-arcmt-test/CMakeLists.txt
@@ -1,8 +1,3 @@
-set( LLVM_LINK_COMPONENTS
-  support
-  mc
-  )
-
 add_clang_executable(c-arcmt-test
   c-arcmt-test.c
   )

diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt
index d850411f33e540382bca8f802e49d279da8a52c0..736065674f6816026d957c00ba45e6ffd1511f33 100644 (file)
--- a/tools/c-index-test/CMakeLists.txt
+++ b/tools/c-index-test/CMakeLists.txt
@@ -1,8 +1,3 @@
-set( LLVM_LINK_COMPONENTS
-  support
-  mc
-  )
-
 add_clang_executable(c-index-test
   c-index-test.c
   )

diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt
index 2070de37fcf528dac255b51767919e05fb2ed713..8b9cd888c8c76fd2889b1493941af8a2379f806e 100644 (file)
--- a/tools/clang-check/CMakeLists.txt
+++ b/tools/clang-check/CMakeLists.txt
@@ -1,9 +1,6 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  asmparser
-  bitreader
-  support
-  mc
+  Option
+  Support
   )
 
 add_clang_executable(clang-check
@@ -11,10 +8,13 @@ add_clang_executable(clang-check
   )
 
 target_link_libraries(clang-check
-  clangTooling
+  clangAST
   clangBasic
+  clangDriver
+  clangFrontend
   clangRewriteFrontend
   clangStaticAnalyzerFrontend
+  clangTooling
   )
 
 install(TARGETS clang-check

diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt
index 7bb3fbf990b501207e06ca4931603cf80090cacb..b029f712190775a1415109fd822794109b85abfb 100644 (file)
--- a/tools/clang-format/CMakeLists.txt
+++ b/tools/clang-format/CMakeLists.txt
@@ -1,15 +1,15 @@
 set(LLVM_LINK_COMPONENTS support)
-set(LLVM_USED_LIBS clangFormat clangTooling clangBasic clangAST)
 
 add_clang_executable(clang-format
   ClangFormat.cpp
   )
 
 target_link_libraries(clang-format
+  clangBasic
   clangFormat
+  clangLex
+  clangRewriteCore
   clangTooling
-  clangBasic
-  clangRewriteFrontend
   )
 
 install(TARGETS clang-format RUNTIME DESTINATION bin)

diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt
index 8aa2d21d62553be5e8d465d84d4601c599dacc35..c56d8a70c49179de5a1c474017d3d3b427cc8046 100644 (file)
--- a/tools/diagtool/CMakeLists.txt
+++ b/tools/diagtool/CMakeLists.txt
@@ -1,9 +1,5 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  asmparser
-  bitreader
-  support
-  mc
+  Support
   )
 
 add_clang_executable(diagtool
@@ -21,8 +17,6 @@ add_dependencies(diagtool
 
 target_link_libraries(diagtool
   clangBasic
-  clangLex
-  clangSema
   clangFrontend
   )
 

diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index c94bc771e1d58c6b4902d6b8caccb6ec54767d3c..4a96d5f069f85b3c2fa95eb1244fc280663404f2 100644 (file)
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -1,14 +1,19 @@
 set( LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
-  asmparser
-  bitreader
-  bitwriter
-  irreader
-  codegen
-  instrumentation
-  ipo
-  linker
-  selectiondag
+  Analysis
+  Core
+  IPA
+  IPO
+  InstCombine
+  Instrumentation
+  MC
+  MCParser
+  ObjCARCOpts
+  Option
+  ScalarOpts
+  Support
+  TransformUtils
+  Vectorize
   )
 
 add_clang_executable(clang
@@ -18,19 +23,10 @@ add_clang_executable(clang
   )
 
 target_link_libraries(clang
-  clangFrontendTool
-  clangAST
-  clangAnalysis
   clangBasic
-  clangCodeGen
   clangDriver
-  clangEdit
   clangFrontend
-  clangLex
-  clangParse
-  clangEdit
-  clangSema
-  clangSerialization
+  clangFrontendTool
   )
 
 if(CLANG_ENABLE_STATIC_ANALYZER)

diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt
index b7bde694272c0cc8234940a0c1bfbc50b5f344bd..a832c1548ad78f559bc5c1819a65791fd56a9674 100644 (file)
--- a/tools/libclang/CMakeLists.txt
+++ b/tools/libclang/CMakeLists.txt
@@ -1,9 +1,6 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  asmparser
-  support
-  bitreader
-  mc
+  BitReader
+  Support
   )
 
 set(SOURCES
@@ -43,19 +40,14 @@ set(SOURCES
   )
 
 set(LIBRARIES
-  clangIndex
   clangARCMigrate
-  clangRewriteCore
-  clangRewriteFrontend
-  clangFrontend
-  clangDriver
-  clangSerialization
-  clangSema
-  clangEdit
   clangAST
+  clangBasic
+  clangFrontend
+  clangIndex
   clangLex
+  clangSema
   clangTooling
-  clangBasic
   )
 
 set(GENERATED_HEADERS

diff --git a/unittests/AST/CMakeLists.txt b/unittests/AST/CMakeLists.txt
index 70f86d3c73010191c8af45ec198cd1aba933f85e..55b028c15882378a9e50dca63173b8f62352f2c5 100644 (file)
--- a/unittests/AST/CMakeLists.txt
+++ b/unittests/AST/CMakeLists.txt
@@ -1,3 +1,7 @@
+set(LLVM_LINK_COMPONENTS
+  Support
+  )
+
 add_clang_unittest(ASTTests
   ASTContextParentMapTest.cpp
   ASTTypeTraitsTest.cpp
@@ -11,5 +15,9 @@ add_clang_unittest(ASTTests
   )
 
 target_link_libraries(ASTTests
-  clangAST clangASTMatchers clangTooling
+  clangAST
+  clangASTMatchers
+  clangBasic
+  clangFrontend
+  clangTooling
   )

diff --git a/unittests/ASTMatchers/CMakeLists.txt b/unittests/ASTMatchers/CMakeLists.txt
index 862c6a0fd95c203760710c3551d6a5a9bae048b8..3ace9fe264b8ac938cb110d4eb382634c7bae56b 100644 (file)
--- a/unittests/ASTMatchers/CMakeLists.txt
+++ b/unittests/ASTMatchers/CMakeLists.txt
@@ -1,15 +1,16 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  asmparser
-  bitreader
-  support
-  mc
+  Support
   )
 
 add_clang_unittest(ASTMatchersTests
   ASTMatchersTest.cpp)
 
 target_link_libraries(ASTMatchersTests
-  gtest gtest_main clangASTMatchers clangTooling)
+  clangAST
+  clangASTMatchers
+  clangBasic
+  clangFrontend
+  clangTooling
+  )
 
 add_subdirectory(Dynamic)

diff --git a/unittests/ASTMatchers/Dynamic/CMakeLists.txt b/unittests/ASTMatchers/Dynamic/CMakeLists.txt
index eb9fa549e118b4f37d730e2309a0eebb569f7973..8b95a7be6e5f114e72a8fc9c7b811095a7baf8c0 100644 (file)
--- a/unittests/ASTMatchers/Dynamic/CMakeLists.txt
+++ b/unittests/ASTMatchers/Dynamic/CMakeLists.txt
@@ -1,7 +1,16 @@
+set(LLVM_LINK_COMPONENTS
+  Support
+  )
+
 add_clang_unittest(DynamicASTMatchersTests
   VariantValueTest.cpp
   ParserTest.cpp
   RegistryTest.cpp)
 
 target_link_libraries(DynamicASTMatchersTests
-  gtest gtest_main clangASTMatchers clangDynamicASTMatchers clangTooling)
+  clangAST
+  clangASTMatchers
+  clangDynamicASTMatchers
+  clangFrontend
+  clangTooling
+  )

diff --git a/unittests/Basic/CMakeLists.txt b/unittests/Basic/CMakeLists.txt
index 51db6ce9e294f1bfedac92ab443c9c28346d162b..e8b766cc8a21dc9f814e46041fba85881fef0712 100644 (file)
--- a/unittests/Basic/CMakeLists.txt
+++ b/unittests/Basic/CMakeLists.txt
@@ -1,3 +1,7 @@
+set(LLVM_LINK_COMPONENTS
+  Support
+  )
+
 add_clang_unittest(BasicTests
   CharInfoTest.cpp
   FileManagerTest.cpp

diff --git a/unittests/Format/CMakeLists.txt b/unittests/Format/CMakeLists.txt
index 83aadb56b9d5c8815de40d565e79e89a0a8bf739..89c7055d5a39c5c9a4b7b1f5fc86869e980f12ff 100644 (file)
--- a/unittests/Format/CMakeLists.txt
+++ b/unittests/Format/CMakeLists.txt
@@ -1,9 +1,5 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  asmparser
-  bitreader
-  support
-  mc
+  Support
   )
 
 add_clang_unittest(FormatTests
@@ -12,8 +8,6 @@ add_clang_unittest(FormatTests
   )
 
 target_link_libraries(FormatTests
-  clangAST
   clangFormat
   clangTooling
-  clangRewriteCore
   )

diff --git a/unittests/Frontend/CMakeLists.txt b/unittests/Frontend/CMakeLists.txt
index c65a1638a4001ccac9e65df7d3f48a24fabeeb1f..cdc955944bcf56efe50d022309c7b9b39966bc03 100644 (file)
--- a/unittests/Frontend/CMakeLists.txt
+++ b/unittests/Frontend/CMakeLists.txt
@@ -1,14 +1,11 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  asmparser
-  bitreader
-  support
-  mc
+  Support
   )
 
 add_clang_unittest(FrontendTests
   FrontendActionTest.cpp
   )
 target_link_libraries(FrontendTests
+  clangAST
   clangFrontend
   )

diff --git a/unittests/Lex/CMakeLists.txt b/unittests/Lex/CMakeLists.txt
index cb3b9275dbdd897eef2826b307b110d965634d87..461e0d95fc87efe2bf63a5d1146336454b447981 100644 (file)
--- a/unittests/Lex/CMakeLists.txt
+++ b/unittests/Lex/CMakeLists.txt
@@ -1,3 +1,7 @@
+set(LLVM_LINK_COMPONENTS
+  Support
+  )
+
 add_clang_unittest(LexTests
   LexerTest.cpp
   PPCallbacksTest.cpp
@@ -5,5 +9,9 @@ add_clang_unittest(LexTests
   )
 
 target_link_libraries(LexTests
-  clangLex clangParse clangSema
+  clangAST
+  clangBasic
+  clangLex
+  clangParse
+  clangSema
   )

diff --git a/unittests/Sema/CMakeLists.txt b/unittests/Sema/CMakeLists.txt
index d491655d415a8e91825b8c1f858cdb19099b6317..c25db814b7c2972c6cb1d6442558d0a29abff921 100644 (file)
--- a/unittests/Sema/CMakeLists.txt
+++ b/unittests/Sema/CMakeLists.txt
@@ -1,7 +1,16 @@
+set(LLVM_LINK_COMPONENTS
+  Support
+  )
+
 add_clang_unittest(SemaTests
   ExternalSemaSourceTest.cpp
   )
 
 target_link_libraries(SemaTests
-  clangAST clangASTMatchers clangTooling
+  clangAST
+  clangBasic
+  clangFrontend
+  clangParse
+  clangSema
+  clangTooling
   )

diff --git a/unittests/Tooling/CMakeLists.txt b/unittests/Tooling/CMakeLists.txt
index 33d761700738327af38a20e28df6ed96bac45963..c59ff87b59db010f5e13ef80f0591099e4acead2 100644 (file)
--- a/unittests/Tooling/CMakeLists.txt
+++ b/unittests/Tooling/CMakeLists.txt
@@ -1,9 +1,5 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  asmparser
-  bitreader
-  support
-  mc
+  Support
   )
 
 add_clang_unittest(ToolingTests
@@ -19,6 +15,10 @@ add_clang_unittest(ToolingTests
 
 target_link_libraries(ToolingTests
   clangAST
-  clangTooling
+  clangASTMatchers
+  clangBasic
+  clangFrontend
+  clangLex
   clangRewriteCore
+  clangTooling
   )