mgorny created this revision. mgorny added reviewers: simark, ilya-biryukov. Herald added a subscriber: ioeric.
Explicitly include and build lib/Testing/Support from LLVM sources when doing a stand-alone build. This is necessary since clangd tests started to depend on LLVMTestingSupport library which is neither installed by LLVM, nor built by clang itself. Since completely separate build of clang-tools-extra is not supported, this relies on variables set by clang CMakeLists. Repository: rCTE Clang Tools Extra https://reviews.llvm.org/D45409 Files: unittests/CMakeLists.txt Index: unittests/CMakeLists.txt =================================================================== --- unittests/CMakeLists.txt +++ unittests/CMakeLists.txt @@ -5,6 +5,15 @@ add_unittest(ExtraToolsUnitTests ${test_dirname} ${ARGN}) endfunction() +if(CLANG_BUILT_STANDALONE) + # LLVMTestingSupport library is needed for clangd tests. + if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support + AND NOT TARGET LLVMTestingSupport) + add_subdirectory(${LLVM_MAIN_SRC_DIR}/lib/Testing/Support + lib/Testing/Support) + endif() +endif() + add_subdirectory(change-namespace) add_subdirectory(clang-apply-replacements) add_subdirectory(clang-move)
Index: unittests/CMakeLists.txt =================================================================== --- unittests/CMakeLists.txt +++ unittests/CMakeLists.txt @@ -5,6 +5,15 @@ add_unittest(ExtraToolsUnitTests ${test_dirname} ${ARGN}) endfunction() +if(CLANG_BUILT_STANDALONE) + # LLVMTestingSupport library is needed for clangd tests. + if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support + AND NOT TARGET LLVMTestingSupport) + add_subdirectory(${LLVM_MAIN_SRC_DIR}/lib/Testing/Support + lib/Testing/Support) + endif() +endif() + add_subdirectory(change-namespace) add_subdirectory(clang-apply-replacements) add_subdirectory(clang-move)
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits