This is an archive of the discontinued LLVM Phabricator instance.

Differential D145946

[third-party] Respect LLVM_INSTALL_GTEST for llvm_gtest_main
ClosedPublic

Authored by mgorny on Mar 13 2023, 8:40 AM.

Details

Reviewers
tstellar
Commits
rGdde05b4b9132: [third-party] Respect LLVM_INSTALL_GTEST for llvm_gtest_main
Summary

Pass BUILDTREE_ONLY to llvm_gtest_main only if LLVM_INSTALL_GTEST
is not set. This fixes 0807986303f5d498cee32d42c242940d00617ad9.
Otherwise, llvm_gtest_main cannot be used
in LLVM_DISTRIBUTION_COMPONENTS, effectively making it impossible
to install llvm_gtest correctly.

Diff Detail

Event Timeline

mgorny created this revision.Mar 13 2023, 8:40 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 13 2023, 8:40 AM
mgorny requested review of this revision.Mar 13 2023, 8:40 AM
tstellar accepted this revision.Mar 13 2023, 8:43 AM

LGTM. Thanks.

This revision is now accepted and ready to land.Mar 13 2023, 8:43 AM
This revision was landed with ongoing or failed builds.Mar 13 2023, 9:12 AM
Closed by commit rGdde05b4b9132: [third-party] Respect LLVM_INSTALL_GTEST for llvm_gtest_main (authored by mgorny). · Explain Why
This revision was automatically updated to reflect the committed changes.
mgorny added a commit: rGdde05b4b9132: [third-party] Respect LLVM_INSTALL_GTEST for llvm_gtest_main.
Herald added a project: Restricted Project. · View Herald TranscriptMar 13 2023, 9:12 AM
Harbormaster completed remote builds in B219059: Diff 504677.Mar 13 2023, 11:04 AM

Revision Contents

PathSize
third-party/
unittest/
UnitTestMain/
8 lines

Diff 504699

third-party/unittest/UnitTestMain/CMakeLists.txt

set(BUILDTREE_ONLY BUILDTREE_ONLY)
if (LLVM_INSTALL_GTEST)
set(BUILDTREE_ONLY "")
endif ()
add_llvm_library(llvm_gtest_main add_llvm_library(llvm_gtest_main
TestMain.cpp TestMain.cpp
LINK_LIBS LINK_LIBS
llvm_gtest llvm_gtest
LINK_COMPONENTS LINK_COMPONENTS
Support # Depends on llvm::cl Support # Depends on llvm::cl
# This library is not meant to be in the install tree, only the build tree. ${BUILDTREE_ONLY}
BUILDTREE_ONLY
) )