bulbazord created this revision. bulbazord added reviewers: labath, mgorny. Herald added a project: All. bulbazord requested review of this revision. Herald added a project: LLDB. Herald added a subscriber: lldb-commits.
In 52f39853abd46495a6d636c4b035e1b92cf4b833 <https://reviews.llvm.org/rG52f39853abd46495a6d636c4b035e1b92cf4b833> 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. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D138237 Files: lldb/CMakeLists.txt lldb/cmake/modules/LLDBStandalone.cmake Index: lldb/cmake/modules/LLDBStandalone.cmake =================================================================== --- lldb/cmake/modules/LLDBStandalone.cmake +++ lldb/cmake/modules/LLDBStandalone.cmake @@ -89,7 +89,6 @@ include(LLVMDistributionSupport) set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") -set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "") set(CMAKE_INCLUDE_CURRENT_DIR ON) include_directories( Index: lldb/CMakeLists.txt =================================================================== --- lldb/CMakeLists.txt +++ lldb/CMakeLists.txt @@ -18,6 +18,7 @@ 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(..)
Index: lldb/cmake/modules/LLDBStandalone.cmake =================================================================== --- lldb/cmake/modules/LLDBStandalone.cmake +++ lldb/cmake/modules/LLDBStandalone.cmake @@ -89,7 +89,6 @@ include(LLVMDistributionSupport) set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") -set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "") set(CMAKE_INCLUDE_CURRENT_DIR ON) include_directories( Index: lldb/CMakeLists.txt =================================================================== --- lldb/CMakeLists.txt +++ lldb/CMakeLists.txt @@ -18,6 +18,7 @@ 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(..)
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits