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

Clang: Disable lib tooling for unsupported versions

Browse Source 
We do only support version 3.9 currently.

Change-Id: I3ecb2dbb56a2990e401ce6cf485f8e3a910fede6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Marco Bubke
2017-07-05 12:53:20 +02:00
parent 89e3262edf
commit 608b157247
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/shared/clang/clang_installation.pri
View File

@@ -28,6 +28,21 @@ defineTest(versionIsAtLeast) {
return(false) return(false)
} }
defineTest(versionIsEqual) {
actual_major_version = $$extractMajorVersion($$1)
actual_minor_version = $$extractMinorVersion($$1)
required_min_major_version = $$2
required_min_minor_version = $$3
isEqual(actual_major_version, $$required_min_major_version) {
isEqual(actual_minor_version, $$required_min_minor_version) {
return(true)
}
}
return(false)
}
defineReplace(findLLVMVersionFromLibDir) { defineReplace(findLLVMVersionFromLibDir) {
libdir = $$1 libdir = $$1
version_dirs = $$files($$libdir/clang/*) version_dirs = $$files($$libdir/clang/*)
@@ -102,9 +117,13 @@ LIBCLANG_LIBS += $${CLANG_LIB}
QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING) QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING)
isEmpty(QTC_NO_CLANG_LIBTOOLING) { isEmpty(QTC_NO_CLANG_LIBTOOLING) {
!contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR} versionIsEqual($$LLVM_VERSION, 3, 9) {
LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}
contains(QMAKE_DEFAULT_INCDIRS, $$LLVM_INCLUDEPATH): LLVM_INCLUDEPATH = LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS
contains(QMAKE_DEFAULT_INCDIRS, $$LLVM_INCLUDEPATH): LLVM_INCLUDEPATH =
} else {
warning("Clang LibTooling is disabled because only version 3.9 is supported.")
}
} else { } else {
warning("Clang LibTooling is disabled.") warning("Clang LibTooling is disabled.")
} }