diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-12-19 16:05:44 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-12-19 16:05:44 +0000 |
| commit | ed79c96f89b3fd5d9998974e06bb596e70214265 (patch) | |
| tree | 9442fc8b6068e5eee612dbc9a95b703f115101cc | |
| parent | 5de6b43898222d2f2633b45f6d264ff68ee479b5 (diff) | |
| download | bcm5719-llvm-ed79c96f89b3fd5d9998974e06bb596e70214265.tar.gz bcm5719-llvm-ed79c96f89b3fd5d9998974e06bb596e70214265.zip | |
[CMake] check-clang: Include ClangUnitTests if it can be built. Check existence of gtest.h then.
llvm-svn: 197688
| -rw-r--r-- | clang/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | clang/test/CMakeLists.txt | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index d842ff41d6b..69a861ec7ef 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -390,8 +390,14 @@ option(CLANG_INCLUDE_TESTS ${LLVM_INCLUDE_TESTS}) if( CLANG_INCLUDE_TESTS ) + if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h) + add_subdirectory(unittests) + list(APPEND CLANG_TEST_DEPS ClangUnitTests) + list(APPEND CLANG_TEST_PARAMS + clang_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/test/Unit/lit.site.cfg + ) + endif() add_subdirectory(test) - add_subdirectory(unittests) endif() option(CLANG_INCLUDE_DOCS "Generate build targets for the Clang docs." diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt index 8d72a1853d3..df8793a4d1b 100644 --- a/clang/test/CMakeLists.txt +++ b/clang/test/CMakeLists.txt @@ -38,13 +38,6 @@ set(CLANG_TEST_PARAMS clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg ) -if(CLANG_INCLUDE_TESTS) - list(APPEND CLANG_TEST_DEPS ClangUnitTests) - list(APPEND CLANG_TEST_PARAMS - clang_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg - ) -endif() - if( NOT CLANG_BUILT_STANDALONE ) list(APPEND CLANG_TEST_DEPS llvm-config |
