Clean up some of the CMake dependencies

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

diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
index 82a81ec42411ca16ca87f90dfaad5efe6dea6372..f56e6c41b0980566231514cdc322ff5c7fe10293 100644 (file)
--- a/lib/AST/CMakeLists.txt
+++ b/lib/AST/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic)
+
 add_clang_library(clangAST
   APValue.cpp
   ASTConsumer.cpp

diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
index 5a31495397aec51f5d21a213fb0d8aa303ed6dac..c432a96d0d7c8ec7f90b3d8f9d11008a0f362cda 100644 (file)
--- a/lib/Frontend/CMakeLists.txt
+++ b/lib/Frontend/CMakeLists.txt
@@ -1,5 +1,19 @@
 set(LLVM_NO_RTTI 1)
 
+set( LLVM_USED_LIBS
+  clangSerialization
+  clangCodeGen
+  clangParse
+  clangSema
+  clangChecker
+  clangAnalysis
+  clangIndex
+  clangRewrite
+  clangAST
+  clangLex
+  clangBasic
+  )
+
 add_clang_library(clangFrontend
   ASTConsumers.cpp
   ASTMerge.cpp

diff --git a/lib/Index/CMakeLists.txt b/lib/Index/CMakeLists.txt
index 61f69b218e26066b8068fee5865e48d62c427f43..ec39dffeba64a4f93e80860961163aa110677005 100644 (file)
--- a/lib/Index/CMakeLists.txt
+++ b/lib/Index/CMakeLists.txt
@@ -1,5 +1,19 @@
 set(LLVM_NO_RTTI 1)
 
+set( LLVM_USED_LIBS
+  clangSerialization
+  clangFrontend
+  clangParse
+  clangSema
+  clangChecker
+  clangAnalysis
+  clangIndex
+  clangRewrite
+  clangAST
+  clangLex
+  clangBasic
+  )
+
 add_clang_library(clangIndex
   ASTLocation.cpp
   Analyzer.cpp

diff --git a/lib/Lex/CMakeLists.txt b/lib/Lex/CMakeLists.txt
index 632fbc6340cc9a04345b32f29f66044aab7508f3..0476384eff3d8e387df9d796177d864778c8b280 100644 (file)
--- a/lib/Lex/CMakeLists.txt
+++ b/lib/Lex/CMakeLists.txt
@@ -2,6 +2,8 @@ set(LLVM_NO_RTTI 1)
 
 # TODO: Add -maltivec when ARCH is PowerPC.
 
+set(LLVM_USED_LIBS clangBasic)
+
 add_clang_library(clangLex
   HeaderMap.cpp
   HeaderSearch.cpp

diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt
index 189af3dc882fb374cccbe15a8f5708193906e204..5b75a668a4c5b0defc2cfd0cbd3b9621a4a0cff0 100644 (file)
--- a/lib/Parse/CMakeLists.txt
+++ b/lib/Parse/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic clangAST clangLex clangSema)
+
 add_clang_library(clangParse
   ParseAST.cpp
   ParseCXXInlineMethods.cpp

diff --git a/lib/Rewrite/CMakeLists.txt b/lib/Rewrite/CMakeLists.txt
index ffeb3e66ebcb420c765d6e2b57af370060a5e409..3be27025fdb878ea184e6c38866513ed961fa448 100644 (file)
--- a/lib/Rewrite/CMakeLists.txt
+++ b/lib/Rewrite/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic)
+
 add_clang_library(clangRewrite
   DeltaTree.cpp
   FixItRewriter.cpp
@@ -14,7 +16,7 @@ add_clang_library(clangRewrite
   TokenRewriter.cpp
   )
 
-add_dependencies(clangBasic
+add_dependencies(clangRewrite
   ClangAttrClasses
   ClangAttrList
   ClangDeclNodes

diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt
index e65bb227f159824128240ff552451a84503a3258..c220e90c1292108bdb69393909fb0f35f4cde513 100644 (file)
--- a/lib/Sema/CMakeLists.txt
+++ b/lib/Sema/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic clangAST clangLex clangAnalysis)
+
 add_clang_library(clangSema
   AnalysisBasedWarnings.cpp
   AttributeList.cpp