diff options
| -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 |
