diff options
| author | Tom Stellard <tstellar@redhat.com> | 2022-11-09 22:32:26 +0300 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2022-11-09 22:34:59 +0300 |
| commit | 8a084f68c8a1cac99d9fa0fbcf490b53ab3b6e0c (patch) | |
| tree | 4ef61837d65f15256f4344c04f13a07503c7f17c /lld | |
| parent | 0b01aebf5e658f3a9c026b194e7d60c0aa7066de (diff) | |
Revert "Move googletest to the third-party directory"
This reverts commit 59052468c3e38cab15582cefbb5133fd4c2ffce5.
It looks like this patch breaks the build when compiler-rt is passed to
LLVM_ENABLE_PROJECTS instead of LLVM_ENABLE_RUNTIMES.
Diffstat (limited to 'lld')
| -rw-r--r-- | lld/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt index 99f284e2e226..21a33c9425a0 100644 --- a/lld/CMakeLists.txt +++ b/lld/CMakeLists.txt @@ -68,11 +68,11 @@ if(LLD_BUILT_STANDALONE) set(LLVM_UTILS_PROVIDED ON) set(LLD_TEST_DEPS FileCheck not) endif() - set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest) + set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest) if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX} AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt) - add_subdirectory(${UNITTEST_DIR} third-party/unittest) + add_subdirectory(${UNITTEST_DIR} utils/unittest) endif() else() # Seek installed Lit. |