Skip to content

Commit 0a1c903

Browse files
etcwildebnbarham
authored andcommitted
Re-expose GTest for now
LLVM hid GTest from folks that aren't building as part of LLVM, or that aren't installing GTest. While this is the right thing to do and is totally sensible, it doesn't work with Swift, which does neither. Re-expose GTest for now. This should get cleaned up once Swift builds things reasonably. (cherry picked from commit ade5638)
1 parent 110ba10 commit 0a1c903

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

third-party/unittest/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ endif()
4242
# by unittests if these are built.
4343

4444
set(BUILDTREE_ONLY BUILDTREE_ONLY)
45-
set(EXCLUDE_FROM_ALL ON)
45+
# TODO: Swift does not build as part of the LLVM unified build, so it can't find
46+
# GTest when LLVM doesn't export it. Swift should be built in the unified
47+
# build, but we're not there yet. Put this back once Swift gets cleaned up
48+
# a bit. rdar://113340971
49+
# set(EXCLUDE_FROM_ALL ON)
4650
if (LLVM_INSTALL_GTEST)
4751
set(EXCLUDE_FROM_ALL OFF)
4852
set(BUILDTREE_ONLY "")

0 commit comments

Comments
 (0)