Fix build with various feature flag combinations

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

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 7bb65e923e2cd6f96656daeb5ceaf16e80e932bd..dfd819a407e986277adc1b9d6a3225c444012d8f 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -3,9 +3,7 @@ add_subdirectory(Basic)
 add_subdirectory(Lex)
 add_subdirectory(Parse)
 add_subdirectory(AST)
-if(CLANG_ENABLE_REWRITER)
-  add_subdirectory(ASTMatchers)
-endif()
+add_subdirectory(ASTMatchers)
 add_subdirectory(Sema)
 add_subdirectory(CodeGen)
 add_subdirectory(Analysis)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2052873cb3a5bbb3f1122d036aa3d31bf8ba2182..b7d689c778f3cbfdf248b53ba2329caf6c962123 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -27,10 +27,16 @@ endif ()
 list(APPEND CLANG_TEST_DEPS
   clang clang-headers
   c-index-test diagtool
-  clang-check clang-format
   clang-tblgen
   )
 
+if (CLANG_ENABLE_REWRITER)
+  list(APPEND CLANG_TEST_DEPS
+    clang-check
+    clang-format
+  )
+endif ()
+
 if (CLANG_ENABLE_ARCMT)
   list(APPEND CLANG_TEST_DEPS
     arcmt-test
@@ -42,6 +48,11 @@ if (ENABLE_CLANG_EXAMPLES)
   list(APPEND CLANG_TEST_DEPS
     clang-interpreter
     PrintFunctionNames
+    )
+endif ()
+
+if (ENABLE_CLANG_STATIC_ANALYZER AND ENABLE_CLANG_EXAMPLES)
+  list(APPEND CLANG_TEST_DEPS
     SampleAnalyzerPlugin
     )
 endif ()