Author: Alex Langford Date: 2022-11-18T09:05:08-08:00 New Revision: 58d38b3ff8c3c4dd816d2047acf65fa97c0b6fb8
URL: https://github.com/llvm/llvm-project/commit/58d38b3ff8c3c4dd816d2047acf65fa97c0b6fb8 DIFF: https://github.com/llvm/llvm-project/commit/58d38b3ff8c3c4dd816d2047acf65fa97c0b6fb8.diff LOG: [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 Added: Modified: lldb/CMakeLists.txt lldb/cmake/modules/LLDBStandalone.cmake Removed: ################################################################################ diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 6f314634d23b1..110c7b09326d8 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 81304723f0f40..6dfb459b5b498 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( _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits