|
Line
Link Here
|
| 0 |
-- a/src/shared/clang/clang_installation.pri |
0 |
++ b/src/shared/clang/clang_installation.pri |
|
Lines 150-165
Link Here
|
| 150 |
output = $$system($$llvm_config --version, lines) |
150 |
output = $$system($$llvm_config --version, lines) |
| 151 |
LLVM_VERSION = $$extractVersion($$output) |
151 |
LLVM_VERSION = $$extractVersion($$output) |
| 152 |
|
152 |
|
| 153 |
!isEmpty(LLVM_VERSION) { |
|
|
| 154 |
versionIsAtLeast($$LLVM_VERSION, 7, 0, 0): { |
| 155 |
CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic |
| 156 |
win32:CLANGFORMAT_LIBS += -lversion |
| 157 |
} else:versionIsAtLeast($$LLVM_VERSION, 6, 0, 0): { |
| 158 |
CLANGFORMAT_LIBS=-lclangFormat -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic |
| 159 |
win32:CLANGFORMAT_LIBS += -lversion |
| 160 |
} |
| 161 |
} |
| 162 |
|
| 163 |
isEmpty(LLVM_VERSION) { |
153 |
isEmpty(LLVM_VERSION) { |
| 164 |
$$llvmWarningOrError(\ |
154 |
$$llvmWarningOrError(\ |
| 165 |
"Cannot determine clang version. Set LLVM_INSTALL_DIR to build the Clang Code Model",\ |
155 |
"Cannot determine clang version. Set LLVM_INSTALL_DIR to build the Clang Code Model",\ |
|
Lines 210-215
Link Here
|
| 210 |
$$llvmWarningOrError("Cannot find Clang shared library in $$LLVM_LIBDIR") |
200 |
$$llvmWarningOrError("Cannot find Clang shared library in $$LLVM_LIBDIR") |
| 211 |
} |
201 |
} |
| 212 |
|
202 |
|
|
|
203 |
versionIsAtLeast($$LLVM_VERSION, 7, 0, 0): { |
| 204 |
exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) { |
| 205 |
CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic |
| 206 |
win32:CLANGFORMAT_LIBS += -lversion |
| 207 |
} else { |
| 208 |
CLANGFORMAT_LIBS=-lclang-cpp |
| 209 |
ALL_CLANG_LIBS=-lclang-cpp |
| 210 |
} |
| 211 |
} else:versionIsAtLeast($$LLVM_VERSION, 6, 0, 0): { |
| 212 |
CLANGFORMAT_LIBS=-lclangFormat -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic |
| 213 |
win32:CLANGFORMAT_LIBS += -lversion |
| 214 |
} |
| 215 |
|
| 213 |
!contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBCLANG_LIBS = -L$${LLVM_LIBDIR} |
216 |
!contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBCLANG_LIBS = -L$${LLVM_LIBDIR} |
| 214 |
LIBCLANG_LIBS += $${CLANG_LIB} |
217 |
LIBCLANG_LIBS += $${CLANG_LIB} |
| 215 |
|
218 |
|
