Add CMake dependencies so that LLVM_USED_LIBS order doesn't matter.

I also sorted the tools/driver dependencies since their order no
longer matters.

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

diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
index e767ebcb3a9e291e77c16864a1c60b7ba70a72d8..9fe18407a83961e2674204b98a8f18609a5583be 100644 (file)
--- a/lib/AST/CMakeLists.txt
+++ b/lib/AST/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(LLVM_LINK_COMPONENTS support)
+
 set(LLVM_USED_LIBS clangBasic)
 
 add_clang_library(clangAST

diff --git a/lib/Basic/CMakeLists.txt b/lib/Basic/CMakeLists.txt
index 0a28fbc37794324544951b443caf99345866ec0a..91e7deb078ad132bbf0826ffb9da5fd256e6fdd0 100644 (file)
--- a/lib/Basic/CMakeLists.txt
+++ b/lib/Basic/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(LLVM_LINK_COMPONENTS mc)
+
 add_clang_library(clangBasic
   Builtins.cpp
   ConvertUTF.c

diff --git a/lib/CodeGen/CMakeLists.txt b/lib/CodeGen/CMakeLists.txt
index 7aa6b15781acfb2c71243b6c3ce5eb03489acceb..8c20f29903aa1339592a503824ecf2bc10a6a000 100644 (file)
--- a/lib/CodeGen/CMakeLists.txt
+++ b/lib/CodeGen/CMakeLists.txt
@@ -1,3 +1,10 @@
+set(LLVM_LINK_COMPONENTS
+  asmparser
+  bitreader
+  bitwriter
+  ipo
+  )
+
 set(LLVM_USED_LIBS clangBasic clangAST clangFrontend)
 
 add_clang_library(clangCodeGen

diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
index 9a53ad6e53df290880d848873d4bdd436f6c644a..9f197b4f8762babb39b841f62ab34bf8f1998ed2 100644 (file)
--- a/lib/Frontend/CMakeLists.txt
+++ b/lib/Frontend/CMakeLists.txt
@@ -1,10 +1,11 @@
 set( LLVM_USED_LIBS
+  clangAST
+  clangBasic
   clangDriver
+  clangLex
   clangParse
   clangSema
-  clangAST
-  clangLex
-  clangBasic
+  clangSerialization
   )
 
 add_clang_library(clangFrontend

diff --git a/lib/Lex/CMakeLists.txt b/lib/Lex/CMakeLists.txt
index 417ad968402e11fd71fdd51e9e217227f8c072e7..80e2820101fef138826931e3cb7771ae99e9454d 100644 (file)
--- a/lib/Lex/CMakeLists.txt
+++ b/lib/Lex/CMakeLists.txt
@@ -1,5 +1,7 @@
 # TODO: Add -maltivec when ARCH is PowerPC.
 
+set(LLVM_LINK_COMPONENTS support)
+
 set(LLVM_USED_LIBS clangBasic)
 
 add_clang_library(clangLex

diff --git a/lib/Serialization/CMakeLists.txt b/lib/Serialization/CMakeLists.txt
index f8c67989a4015c2a82c318cf18e306156d713408..10c8904b7aa581e4444acd661e503f7075b00239 100644 (file)
--- a/lib/Serialization/CMakeLists.txt
+++ b/lib/Serialization/CMakeLists.txt
@@ -1,4 +1,5 @@
-set(LLVM_USED_LIBS clangFrontend)
+# TODO: This must need some dependencies, but it builds fine without them.
+#set(LLVM_USED_LIBS ???)
 
 add_clang_library(clangSerialization
   GeneratePCH.cpp

diff --git a/lib/StaticAnalyzer/Core/CMakeLists.txt b/lib/StaticAnalyzer/Core/CMakeLists.txt
index 828613003c5af6283f88e0a4d6ab67d443bf50a7..a5996ba05e041c4c59d527530cfc72bfde81e39e 100644 (file)
--- a/lib/StaticAnalyzer/Core/CMakeLists.txt
+++ b/lib/StaticAnalyzer/Core/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(LLVM_LINK_COMPONENTS support)
+
 set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite)
 
 add_clang_library(clangStaticAnalyzerCore

diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index e38bb3768aa94a343f21914ba40e2cb26bfdf648..d948eb93f56cd31f8e934f47083f12adeb14ec14 100644 (file)
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -1,19 +1,19 @@
 set( LLVM_USED_LIBS
-  clangFrontendTool
-  clangFrontend
-  clangDriver
-  clangSerialization
+  clangAST
+  clangAnalysis
+  clangBasic
   clangCodeGen
+  clangDriver
+  clangFrontend
+  clangFrontendTool
+  clangIndex
+  clangLex
   clangParse
+  clangRewrite
   clangSema
+  clangSerialization
   clangStaticAnalyzerCheckers
   clangStaticAnalyzerCore
-  clangAnalysis
-  clangIndex
-  clangRewrite
-  clangAST
-  clangLex
-  clangBasic
   )
 
 set( LLVM_LINK_COMPONENTS