From: Douglas Gregor Date: Thu, 9 Sep 2010 15:44:58 +0000 (+0000) Subject: Clean up CMake dependencies X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec9bf475657e4fd7c8e920ff816a4e3cdb2ea213;p=clang 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 850e9b4681..a2cfcfc4fa 100644 --- 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 5b54f0d12d..76da8d815a 100644 --- 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 b5a23291f8..1767a7d47b 100644 --- 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 00d076bb7e..9d41b55981 100644 --- 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 756d17c0d4..ca8fbcf5f9 100644 --- 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 26c9fc7b51..09d9e3419d 100644 --- 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 ec39dffeba..bbe9b567ac 100644 --- 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 3be27025fd..853a9c0b12 100644 --- 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 d863c179be..a3782180b3 100644 --- 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 5cf2cd6ebf..0cda6c4a31 100644 --- 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 29ef574fff..9a2a2a63cf 100644 --- 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)