r212996 - Fix build with various feature flag combinations

[Alp Toker]

Author: alp
Date: Mon Jul 14 17:17:22 2014
New Revision: 212996

URL: http://llvm.org/viewvc/llvm-project?rev=212996&view=rev
Log:
Fix build with various feature flag combinations

Modified:
    cfe/trunk/lib/CMakeLists.txt
    cfe/trunk/test/CMakeLists.txt

Modified: cfe/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CMakeLists.txt?rev=212996&r1=212995&r2=212996&view=diff
==============================================================================
--- cfe/trunk/lib/CMakeLists.txt (original)
+++ cfe/trunk/lib/CMakeLists.txt Mon Jul 14 17:17:22 2014
@@ -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)

Modified: cfe/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CMakeLists.txt?rev=212996&r1=212995&r2=212996&view=diff
==============================================================================
--- cfe/trunk/test/CMakeLists.txt (original)
+++ cfe/trunk/test/CMakeLists.txt Mon Jul 14 17:17:22 2014
@@ -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 ()