From 84dd43f413a698eed41cceea2e8342e08755b083 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 24 Nov 2016 11:35:19 +0100 Subject: [PATCH] qbs build: Fix passing on include dir for intrinsics of libclang In commit 31258ec5555d929f4cd33e2836e24b470cf6908b qbs build: Introduce libclang module. "llvmVersion" was overlooked. Because of this, the definition of CLANG_RESOURCE_DIR in clangcodemodel.qbs led to an invalid path which eventually was discarded. Change-Id: Ia1eb50cf738df4affbedc99849bf5326a8e8fb19 Reviewed-by: Christian Kandeler --- qbs/modules/libclang/libclang.qbs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qbs/modules/libclang/libclang.qbs b/qbs/modules/libclang/libclang.qbs index 6e15ed36d77..871b1e0f693 100644 --- a/qbs/modules/libclang/libclang.qbs +++ b/qbs/modules/libclang/libclang.qbs @@ -8,12 +8,14 @@ Module { id: clangProbe property string llvmConfig + property string llvmVersion property string llvmIncludeDir property string llvmLibDir property stringList llvmLibs configure: { llvmConfig = ClangFunctions.llvmConfig(qbs, QtcFunctions); + llvmVersion = ClangFunctions.version(llvmConfig); llvmIncludeDir = ClangFunctions.includeDir(llvmConfig); llvmLibDir = ClangFunctions.libDir(llvmConfig); llvmLibs = ClangFunctions.libraries(qbs.targetOS); @@ -22,6 +24,7 @@ Module { } property string llvmConfig: clangProbe.llvmConfig + property string llvmVersion: clangProbe.llvmVersion property string llvmIncludeDir: clangProbe.llvmIncludeDir property string llvmLibDir: clangProbe.llvmLibDir property stringList llvmLibs: clangProbe.llvmLibs