feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix compilation of ClangFormat plugin against LLVM with clang-cpp

Browse Source 
The ClangFormat plugin needs to link against clang-cpp in that
case as well.

Fixes: QTCREATORBUG-25138
Change-Id: I84b1784b291d8944a9dee66ec14db32ad72ff8b5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2020-12-18 14:38:34 +01:00
parent 305ca7e434
commit f74b317598
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindClang.cmake
View File

@@ -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) if (TARGET clangTooling AND NOT CLANGTOOLING_LINK_CLANG_DYLIB)
set(CLANG_TOOLING_LIBS libclang clangTooling clangQuery clangIndex) set(CLANG_TOOLING_LIBS libclang clangTooling clangQuery clangIndex)
set(CLANG_FORMAT_LIB clangFormat)
elseif (TARGET clang-cpp) elseif (TARGET clang-cpp)
set(CLANG_TOOLING_LIBS libclang clang-cpp) set(CLANG_TOOLING_LIBS libclang clang-cpp)
set(CLANG_FORMAT_LIB clang-cpp)
endif() endif()

2
src/plugins/clangformat/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_plugin(ClangFormat add_qtc_plugin(ClangFormat
CONDITION TARGET libclang AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND QTC_CLANG_BUILDMODE_MATCH 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}" INCLUDES "${CLANG_INCLUDE_DIRS}"
PLUGIN_DEPENDS Core TextEditor CppEditor CppTools ProjectExplorer PLUGIN_DEPENDS Core TextEditor CppEditor CppTools ProjectExplorer
SOURCES SOURCES