30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
diff -Naur clang-12.0.0rc1.src.orig/CMakeLists.txt clang-12.0.0rc1.src/CMakeLists.txt
|
|
--- clang-12.0.0rc1.src.orig/CMakeLists.txt 2021-02-14 21:40:31.000000000 +0100
|
|
+++ clang-12.0.0rc1.src/CMakeLists.txt 2021-02-14 21:41:57.000000000 +0100
|
|
@@ -153,12 +153,6 @@
|
|
set(LLVM_UTILS_PROVIDED ON)
|
|
set(CLANG_TEST_DEPS FileCheck count not)
|
|
endif()
|
|
- set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
|
|
- if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
|
|
- AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
|
|
- AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
|
|
- add_subdirectory(${UNITTEST_DIR} utils/unittest)
|
|
- endif()
|
|
else()
|
|
# Seek installed Lit.
|
|
find_program(LLVM_LIT
|
|
@@ -537,7 +531,11 @@
|
|
|
|
|
|
if( CLANG_INCLUDE_TESTS )
|
|
- if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h)
|
|
+ set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
|
|
+ if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
|
|
+ AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
|
|
+ AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
|
|
+ add_subdirectory(${UNITTEST_DIR} utils/unittest)
|
|
add_subdirectory(unittests)
|
|
list(APPEND CLANG_TEST_DEPS ClangUnitTests)
|
|
list(APPEND CLANG_TEST_PARAMS
|