More correct fix for CMake breakage I was seeing, my buildbots use

LLVM_INCLUDE_TESTS:=OFF, which may no longer be necessary for all I know.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63b721354e9321412459ac4b89f99d7e5157ffa4..0d923b91e1236fd332da66dd81d9067fb538c8f2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,7 +215,9 @@ add_subdirectory(tools)
 add_subdirectory(runtime)
 
 # TODO: docs.
+if( LLVM_INCLUDE_TESTS )
 add_subdirectory(test)
+endif()
 
 # FIXME: unittests require gtest.
 if( NOT CLANG_BUILT_STANDALONE )

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9e22ba5bc58837ba3140a5702d98df3b9bda2452..a32b9943c2a685017b6a3e7ccc557926e88c611c 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -113,7 +113,7 @@ if(PYTHONINTERP_FOUND)
                 ${LLVM_BINARY_DIR}/test
                 ${CMAKE_CURRENT_BINARY_DIR}
                 COMMENT "Running Clang and LLVM regression tests")
-    add_dependencies(check-all clang-test.deps)
+    add_dependencies(check-all check.deps clang-test.deps)
     add_dependencies(clang-test.deps
                      ClangUnitTests
                      llvm-dis opt