This is an archive of the discontinued LLVM Phabricator instance.

Differential D138237

[lldb] Restore default setting of LLDB_INCLUDE_TESTS in standalone builds
ClosedPublic

Authored by bulbazord on Nov 17 2022, 1:59 PM.

Details

Reviewers
labath
mgorny
Commits
rG58d38b3ff8c3: [lldb] Restore default setting of LLDB_INCLUDE_TESTS in standalone builds
Summary

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.

Diff Detail

Event Timeline

bulbazord created this revision.Nov 17 2022, 1:59 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 17 2022, 1:59 PM
bulbazord requested review of this revision.Nov 17 2022, 1:59 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 17 2022, 1:59 PM
Herald added a subscriber: lldb-commits. · View Herald Transcript
Harbormaster completed remote builds in B198288: Diff 476225.Nov 17 2022, 2:03 PM
Herald added a subscriber: JDevlieghere. · View Herald TranscriptNov 17 2022, 2:03 PM
mgorny accepted this revision.Nov 17 2022, 11:45 PM

Thanks, this makes sense. I just wish we could get D137035 in and avoid this whole complexity in the first place.

This revision is now accepted and ready to land.Nov 17 2022, 11:45 PM
Closed by commit rG58d38b3ff8c3: [lldb] Restore default setting of LLDB_INCLUDE_TESTS in standalone builds (authored by bulbazord). · Explain WhyNov 18 2022, 9:05 AM
This revision was automatically updated to reflect the committed changes.
bulbazord added a commit: rG58d38b3ff8c3: [lldb] Restore default setting of LLDB_INCLUDE_TESTS in standalone builds.

Revision Contents

PathSize
lldb/
1 line
cmake/
modules/
1 line

Diff 476225

lldb/CMakeLists.txt

Show All 12 Linesset(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
) )
# If we are not building as part of LLVM, build LLDB as a standalone project, # If we are not building as part of LLVM, build LLDB as a standalone project,
# using LLVM as an external library. # using LLVM as an external library.
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
project(lldb) project(lldb)
set(LLDB_BUILT_STANDALONE TRUE) set(LLDB_BUILT_STANDALONE TRUE)
set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "")
endif() endif()
# Must go below project(..) # Must go below project(..)
include(GNUInstallDirs) include(GNUInstallDirs)
option(LLDB_INCLUDE_TESTS "Generate build targets for the LLDB unit tests." ${LLVM_INCLUDE_TESTS}) option(LLDB_INCLUDE_TESTS "Generate build targets for the LLDB unit tests." ${LLVM_INCLUDE_TESTS})
if(LLDB_BUILT_STANDALONE) if(LLDB_BUILT_STANDALONE)
▲ Show 20 Lines • Show All 122 Lines • Show Last 20 Lines

lldb/cmake/modules/LLDBStandalone.cmake

Show First 20 Lines • Show All 83 Lines • ▼ Show 20 Lines
include(AddLLVM) include(AddLLVM)
include(TableGen) include(TableGen)
include(HandleLLVMOptions) include(HandleLLVMOptions)
include(CheckAtomic) include(CheckAtomic)
include(LLVMDistributionSupport) include(LLVMDistributionSupport)
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "")
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
include_directories( include_directories(
"${CMAKE_BINARY_DIR}/include" "${CMAKE_BINARY_DIR}/include"
"${LLVM_INCLUDE_DIRS}" "${LLVM_INCLUDE_DIRS}"
"${CLANG_INCLUDE_DIRS}") "${CLANG_INCLUDE_DIRS}")
if(LLDB_INCLUDE_TESTS) if(LLDB_INCLUDE_TESTS)
Show All 28 Lines