Fix build with various feature flag combinations

llvm-svn: 212996

clang/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)

clang/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 ()