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

Clang: Check for libclang main header file

Browse Source 
Otherwise we will run into compile errors if the libclang dev package is
not installed.

Change-Id: I31c05d9d0e11154f1c3748e6736c143805d310e8
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-09-04 10:21:41 +02:00
parent e873f872ef
commit 164b72b22a
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangcodemodel.qbs
View File

@@ -30,7 +30,7 @@ QtcPlugin {
property string llvmLibs: Clang.libraries(qbs.targetOS) property string llvmLibs: Clang.libraries(qbs.targetOS)
property string llvmVersion: Clang.version(llvmConfig, QtcProcessOutputReader) property string llvmVersion: Clang.version(llvmConfig, QtcProcessOutputReader)
condition: llvmConfig condition: llvmConfig && File.exists(llvmIncludeDir.concat("/clang-c/Index.h"))
cpp.includePaths: base.concat(llvmIncludeDir) cpp.includePaths: base.concat(llvmIncludeDir)
cpp.libraryPaths: base.concat(llvmLibDir) cpp.libraryPaths: base.concat(llvmLibDir)

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

@@ -87,7 +87,8 @@ unix {
LLVM_VERSION = $$findLLVMVersionFromLibDir($$LLVM_LIBDIR) LLVM_VERSION = $$findLLVMVersionFromLibDir($$LLVM_LIBDIR)
} }
!exists($$LLVM_INCLUDEPATH): error("Cannot detect include dir for clang, candidate: $$LLVM_INCLUDEPATH") LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h
!exists($$LIBCLANG_MAIN_HEADER): error("Cannot find libclang's main header file, candidate: $$LIBCLANG_MAIN_HEADER")
!exists($$LLVM_LIBDIR): error("Cannot detect lib dir for clang, candidate: $$LLVM_LIBDIR") !exists($$LLVM_LIBDIR): error("Cannot detect lib dir for clang, candidate: $$LLVM_LIBDIR")
clang_lib = $$findClangLibInLibDir($$LLVM_LIBDIR) clang_lib = $$findClangLibInLibDir($$LLVM_LIBDIR)
isEmpty(clang_lib): error("Cannot find Clang shared library in $$LLVM_LIBDIR") isEmpty(clang_lib): error("Cannot find Clang shared library in $$LLVM_LIBDIR")

3
src/tools/clangbackend/clangbackend.qbs
View File

@@ -1,4 +1,5 @@
import qbs 1.0 import qbs 1.0
import qbs.File
import QtcClangInstallation as Clang import QtcClangInstallation as Clang
import QtcFunctions import QtcFunctions
import QtcProcessOutputReader import QtcProcessOutputReader
@@ -23,7 +24,7 @@ QtcTool {
property string llvmLibDir: Clang.libDir(llvmConfig, QtcProcessOutputReader) property string llvmLibDir: Clang.libDir(llvmConfig, QtcProcessOutputReader)
property string llvmLibs: Clang.libraries(qbs.targetOS) property string llvmLibs: Clang.libraries(qbs.targetOS)
condition: llvmConfig condition: llvmConfig && File.exists(llvmIncludeDir.concat("/clang-c/Index.h"))
cpp.includePaths: base.concat(["ipcsource", llvmIncludeDir]) cpp.includePaths: base.concat(["ipcsource", llvmIncludeDir])
cpp.libraryPaths: base.concat(llvmLibDir) cpp.libraryPaths: base.concat(llvmLibDir)