summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2011-02-18 22:55:32 +0000
committerDaniel Dunbar <daniel@zuster.org>2011-02-18 22:55:32 +0000
commit5423b497ab89dba7b648d853a3419637e398a3fc (patch)
tree0c74c62ff1c1955c5f9195a13a936da2d3083a5c /clang
parentb7ae3ccb8474eefbb2855762efd3c236e7a9ae22 (diff)
downloadbcm5719-llvm-5423b497ab89dba7b648d853a3419637e398a3fc.tar.gz
bcm5719-llvm-5423b497ab89dba7b648d853a3419637e398a3fc.zip
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. llvm-svn: 125985
Diffstat (limited to 'clang')
-rw-r--r--clang/CMakeLists.txt2
-rw-r--r--clang/test/CMakeLists.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index 63b721354e9..0d923b91e12 100644
--- a/clang/CMakeLists.txt
+++ b/clang/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/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt
index 9e22ba5bc58..a32b9943c2a 100644
--- a/clang/test/CMakeLists.txt
+++ b/clang/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
OpenPOWER on IntegriCloud