Clean up CMake dependencies

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

diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt
index 850e9b468100bb661fe1c61a0450ea900589067e..a2cfcfc4fa12483c90a3fc9c4ea7020b127d480c 100644 (file)
--- a/lib/Analysis/CMakeLists.txt
+++ b/lib/Analysis/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic clangAST clangIndex)
+
 add_clang_library(clangAnalysis
   AnalysisContext.cpp
   CFG.cpp

diff --git a/lib/Checker/CMakeLists.txt b/lib/Checker/CMakeLists.txt
index 5b54f0d12d5d3d34f9c3aab791be93744aae844f..76da8d815af41e0719ed5edd6f0c499b982c4647 100644 (file)
--- a/lib/Checker/CMakeLists.txt
+++ b/lib/Checker/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite)
+
 add_clang_library(clangChecker
   AdjustedReturnValueChecker.cpp
   AggExprVisitor.cpp

diff --git a/lib/CodeGen/CMakeLists.txt b/lib/CodeGen/CMakeLists.txt
index b5a23291f8a2e07caa4f80921942fc5e55389028..1767a7d47bea9c41fd6cf1dcd89a0c8637f2b3b6 100644 (file)
--- a/lib/CodeGen/CMakeLists.txt
+++ b/lib/CodeGen/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic clangAST clangFrontend)
+
 add_clang_library(clangCodeGen
   BackendUtil.cpp
   CGBlocks.cpp

diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt
index 00d076bb7eb8ea24cb8cfeb2ffbed33ef4100271..9d41b55981b586ac174b0e509afa077a1661757a 100644 (file)
--- a/lib/Driver/CMakeLists.txt
+++ b/lib/Driver/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic clangAST clangParse)
+
 add_clang_library(clangDriver
   Action.cpp
   Arg.cpp

diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
index 756d17c0d43478830d84066553e43501a5fc4a19..ca8fbcf5f90d9060b4c8d20431c984137f25ac97 100644 (file)
--- a/lib/Frontend/CMakeLists.txt
+++ b/lib/Frontend/CMakeLists.txt
@@ -1,14 +1,9 @@
 set(LLVM_NO_RTTI 1)
 
 set( LLVM_USED_LIBS
-  clangSerialization
-  clangCodeGen
+  clangDriver
   clangParse
   clangSema
-  clangChecker
-  clangAnalysis
-  clangIndex
-  clangRewrite
   clangAST
   clangLex
   clangBasic

diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt
index 26c9fc7b5106979ce0d0eb8929a3738a2dfd6bdd..09d9e3419dc27f3639efa9a1098177c834cdd5ac 100644 (file)
--- a/lib/FrontendTool/CMakeLists.txt
+++ b/lib/FrontendTool/CMakeLists.txt
@@ -1,5 +1,8 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangDriver clangFrontend clangRewrite clangCodeGen 
+    clangChecker)
+
 add_clang_library(clangFrontendTool
   ExecuteCompilerInvocation.cpp
   )

diff --git a/lib/Index/CMakeLists.txt b/lib/Index/CMakeLists.txt
index ec39dffeba64a4f93e80860961163aa110677005..bbe9b567acf97d05b8bc372ad7d64f3b3a009beb 100644 (file)
--- a/lib/Index/CMakeLists.txt
+++ b/lib/Index/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic clangLex clangAST)
+
 set( LLVM_USED_LIBS
   clangSerialization
   clangFrontend
@@ -27,3 +29,6 @@ add_clang_library(clangIndex
   Program.cpp
   SelectorMap.cpp
   )
+
+add_dependencies(clangIndex ClangAttrClasses ClangAttrList
+                 ClangDeclNodes ClangStmtNodes)

diff --git a/lib/Rewrite/CMakeLists.txt b/lib/Rewrite/CMakeLists.txt
index 3be27025fdb878ea184e6c38866513ed961fa448..853a9c0b1229e98922fdc49d819dc34c6a2c5747 100644 (file)
--- a/lib/Rewrite/CMakeLists.txt
+++ b/lib/Rewrite/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-set(LLVM_USED_LIBS clangBasic)
+set(LLVM_USED_LIBS clangBasic clangAST clangParse clangFrontend)
 
 add_clang_library(clangRewrite
   DeltaTree.cpp

diff --git a/lib/Serialization/CMakeLists.txt b/lib/Serialization/CMakeLists.txt
index d863c179bed29e93e81684a28703f890861a1a0f..a3782180b324f7657a03c28e71d90f6230783ec0 100644 (file)
--- a/lib/Serialization/CMakeLists.txt
+++ b/lib/Serialization/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangFrontend)
+
 add_clang_library(clangSerialization
   GeneratePCH.cpp
   ASTCommon.cpp

diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt
index 5cf2cd6ebf3445642e6b33c4016c7900d84ca5b3..0cda6c4a31b8ac426cd0ee0c5e86bcb2023c81b2 100644 (file)
--- a/tools/c-index-test/CMakeLists.txt
+++ b/tools/c-index-test/CMakeLists.txt
@@ -1,18 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-set( LLVM_USED_LIBS
-  libclang
-  clangIndex
-  clangFrontend
-  clangDriver
-  clangSerialization
-  clangParse
-  clangSema
-  clangAnalysis
-  clangAST
-  clangLex
-  clangBasic
-  )
+set(LLVM_USED_LIBS libclang)
 
 set( LLVM_LINK_COMPONENTS
   bitreader

diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt
index 29ef574fff6a73e4526140c9a7231b49229b858a..9a2a2a63cfdaf1b178db4db95aa727df21e5cf81 100644 (file)
--- a/tools/libclang/CMakeLists.txt
+++ b/tools/libclang/CMakeLists.txt
@@ -6,9 +6,8 @@ set(LLVM_USED_LIBS
   clangFrontend
   clangDriver
   clangSerialization
-  clangParse
+  clangIndex
   clangSema
-  clangAnalysis
   clangAST
   clangLex
   clangBasic)