From 031fe30260afcc9e0c202a5fb0ed6c8c6de5ac57 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 9 May 2022 16:24:57 +0200 Subject: [PATCH] ClangCodeModel: Update build system files There is no compile-time dependency to libclang anymore. Change-Id: I3b07977ba037a9c39c54d95c39f0505ae934cb02 Reviewed-by: Reviewed-by: David Schulz --- src/plugins/clangcodemodel/CMakeLists.txt | 5 ----- src/plugins/clangcodemodel/clangcodemodel.qbs | 3 --- 2 files changed, 8 deletions(-) diff --git a/src/plugins/clangcodemodel/CMakeLists.txt b/src/plugins/clangcodemodel/CMakeLists.txt index 4f47be868a6..7d485f7a6f8 100644 --- a/src/plugins/clangcodemodel/CMakeLists.txt +++ b/src/plugins/clangcodemodel/CMakeLists.txt @@ -1,18 +1,13 @@ -set(CLANG_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}) - set(TEST_LINK_DEPENDS) if(WITH_TESTS) set(TEST_LINK_DEPENDS QtSupport) endif() add_qtc_plugin(ClangCodeModel - CONDITION TARGET libclang DEPENDS CPlusPlus PLUGIN_DEPENDS Core CppEditor LanguageClient ${TEST_LINK_DEPENDS} TextEditor PLUGIN_TEST_DEPENDS QmakeProjectManager DEFINES - CLANG_VERSION="${CLANG_VERSION}" - CLANG_INCLUDE_DIR="${LLVM_LIBRARY_DIR}/clang/${CLANG_VERSION}/include" CLANG_BINDIR="${LLVM_TOOLS_BINARY_DIR}" SOURCES clangactivationsequencecontextprocessor.cpp clangactivationsequencecontextprocessor.h diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs index e36a4635d04..94d92a19483 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.qbs +++ b/src/plugins/clangcodemodel/clangcodemodel.qbs @@ -14,15 +14,12 @@ QtcPlugin { Depends { name: "TextEditor" } Depends { name: "Utils" } - Depends { name: "libclang"; required: false } Depends { name: "clang_defines" } pluginTestDepends: [ "QmakeProjectManager", ] - condition: libclang.present - files: [ "clangactivationsequencecontextprocessor.cpp", "clangactivationsequencecontextprocessor.h",