54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From 04b642c646048dd9df652eba05d45beaa13bc895 Mon Sep 17 00:00:00 2001
|
|
From: Konrad Kleine <kkleine@redhat.com>
|
|
Date: Mon, 23 Jan 2023 13:14:17 +0000
|
|
Subject: [PATCH] Rebased D138472
|
|
|
|
---
|
|
clang/CMakeLists.txt | 23 ++++++++++-------------
|
|
1 file changed, 10 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
|
|
index 090cfa352078..f87838776c32 100644
|
|
--- a/clang/CMakeLists.txt
|
|
+++ b/clang/CMakeLists.txt
|
|
@@ -118,12 +118,11 @@ if(CLANG_BUILT_STANDALONE)
|
|
set(LLVM_UTILS_PROVIDED ON)
|
|
set(CLANG_TEST_DEPS FileCheck count not)
|
|
endif()
|
|
- set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/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} third-party/unittest)
|
|
- endif()
|
|
+ endif()
|
|
+
|
|
+ find_package(LLVMGTest HINTS "${LLVM_CMAKE_DIR}")
|
|
+ if (NOT TARGET llvm_gtest)
|
|
+ message(FATAL_ERROR "llvm-gtest not found. Please install llvm-gtest or disable tests with -DLLVM_INCLUDE_TESTS=OFF")
|
|
endif()
|
|
|
|
if(LLVM_LIT)
|
|
@@ -506,13 +505,11 @@ endif()
|
|
|
|
|
|
if( CLANG_INCLUDE_TESTS )
|
|
- if(EXISTS ${LLVM_THIRD_PARTY_DIR}/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(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
|
|
+ )
|
|
add_subdirectory(test)
|
|
add_subdirectory(bindings/python/tests)
|
|
|
|
--
|
|
2.34.3
|
|
|