diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-10-02 10:53:31 +0200 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-10-05 11:08:27 +0000 |
| commit | e0d7d037207c2716380b7a2a860e13138f6eaed5 (patch) | |
| tree | 78cd380447ac7e5c28873b30a2b08df293291cf2 /src/shared | |
| parent | 0e84c8892d98adb61c16d6a9acfee6abfa1a7abe (diff) | |
Clang: Fix ClangFormat build with clang-7
Change-Id: I0859b7aad1a49f8d46ee4b32cc32039cfa0b482b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/clang/clang_installation.pri | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index 863d29cf481..728cbb3ba4e 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -116,9 +116,6 @@ CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lcla -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic win32:CLANGTOOLING_LIBS += -lversion -CLANGFORMAT_LIBS=-lclangFormat -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic -win32:CLANGFORMAT_LIBS += -lversion - BIN_EXTENSION = win32: BIN_EXTENSION = .exe @@ -141,6 +138,17 @@ isEmpty(LLVM_INSTALL_DIR) { output = $$system($$llvm_config --version, lines) LLVM_VERSION = $$extractVersion($$output) + +!isEmpty(LLVM_VERSION) { + versionIsAtLeast($$LLVM_VERSION, 7, 0, 0): { + CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic + win32:CLANGFORMAT_LIBS += -lversion + } else:versionIsAtLeast($$LLVM_VERSION, 6, 0, 0): { + CLANGFORMAT_LIBS=-lclangFormat -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic + win32:CLANGFORMAT_LIBS += -lversion + } +} + isEmpty(LLVM_VERSION) { $$llvmWarningOrError(\ "Cannot determine clang version. Set LLVM_INSTALL_DIR to build the Clang Code Model",\ |