From 58d38b3ff8c3c4dd816d2047acf65fa97c0b6fb8 Mon Sep 17 00:00:00 2001 From: Alex Langford Date: Thu, 17 Nov 2022 13:46:40 -0800 Subject: [PATCH] [lldb] Restore default setting of LLDB_INCLUDE_TESTS in standalone builds In 52f39853abd46495a6d636c4b035e1b92cf4b833 the option LLDB_INCLUDE_TESTS was moved above the inclusion of LLDBStandalone. This isn't a problem per-se, but it changes the default value of LLDB_INCLUDE_TESTS in standalone builds. LLDBStandalone explicitly sets LLVM_INCLUDE_TESTS to true, indicating that for standalone builds this is considered the default behavior. This patch restores said default behavior. Differential Revision: https://reviews.llvm.org/D138237 --- lldb/CMakeLists.txt | 1 + lldb/cmake/modules/LLDBStandalone.cmake | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 6f314634d23b..110c7b09326d 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -18,6 +18,7 @@ set(CMAKE_MODULE_PATH if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) project(lldb) set(LLDB_BUILT_STANDALONE TRUE) + set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "") endif() # Must go below project(..) diff --git a/lldb/cmake/modules/LLDBStandalone.cmake b/lldb/cmake/modules/LLDBStandalone.cmake index 81304723f0f4..6dfb459b5b49 100644 --- a/lldb/cmake/modules/LLDBStandalone.cmake +++ b/lldb/cmake/modules/LLDBStandalone.cmake @@ -89,7 +89,6 @@ include(CheckAtomic) include(LLVMDistributionSupport) set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") -set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "") set(CMAKE_INCLUDE_CURRENT_DIR ON) include_directories(