diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake index b515820be1e..c745174ca19 100644 --- a/cmake/FindClang.cmake +++ b/cmake/FindClang.cmake @@ -9,8 +9,10 @@ option(CLANGTOOLING_LINK_CLANG_DYLIB "Force linking of Clang tooling against cla if (TARGET clangTooling AND NOT CLANGTOOLING_LINK_CLANG_DYLIB) set(CLANG_TOOLING_LIBS libclang clangTooling clangQuery clangIndex) + set(CLANG_FORMAT_LIB clangFormat) elseif (TARGET clang-cpp) set(CLANG_TOOLING_LIBS libclang clang-cpp) + set(CLANG_FORMAT_LIB clang-cpp) endif() diff --git a/src/plugins/clangformat/CMakeLists.txt b/src/plugins/clangformat/CMakeLists.txt index 83593064265..641343239cb 100644 --- a/src/plugins/clangformat/CMakeLists.txt +++ b/src/plugins/clangformat/CMakeLists.txt @@ -1,6 +1,6 @@ add_qtc_plugin(ClangFormat CONDITION TARGET libclang AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND QTC_CLANG_BUILDMODE_MATCH - DEPENDS Utils Qt5::Widgets clangFormat + DEPENDS Utils Qt5::Widgets ${CLANG_FORMAT_LIB} INCLUDES "${CLANG_INCLUDE_DIRS}" PLUGIN_DEPENDS Core TextEditor CppEditor CppTools ProjectExplorer SOURCES