From 61775a844efc86a37aa8c11ffdefa23b1771cf10 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 14 Feb 2019 15:56:35 +0100 Subject: Clang: Build clangformat only if clang/Format/Format.h exists ...in the LLVM_INSTALL_DIR. Change-Id: I974f32759bca7fb467524bf61ff7967098748f0e Reviewed-by: Ivan Donchevskii --- qbs/modules/libclang/functions.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qbs') diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 4d384d773e..3a75fe1ead 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -103,6 +103,10 @@ function extraLibraries(llvmConfig, targetOS) function formattingLibs(llvmConfig, qtcFunctions, targetOS) { + var llvmIncludeDir = includeDir(llvmConfig); + if (!File.exists(llvmIncludeDir.concat("/clang/Format/Format.h"))) + return []; + var clangVersion = version(llvmConfig) var libs = [] if (qtcFunctions.versionIsAtLeast(clangVersion, MinimumLLVMVersion)) { -- cgit v1.2.1 From 52ec46a60fae6cfbcae51c30de7c66f1ac31597e Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 22 Feb 2019 10:37:36 +0100 Subject: Fix build of command-line qbs with qbs The plugin path we pass as a define to the qbs sources contained the "/ qbs/plugins" suffix which qbs already adds itself. Therefore, the command-line qbs was not functional. Change-Id: I2bfb967f998e69bbe4da760a1f517e1f40e4f055 Reviewed-by: Christian Stenger Reviewed-by: Joerg Bornemann --- qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qbs') diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index 845ce4139c..4a0d6cab1d 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -25,7 +25,7 @@ Module { property string relativeLibexecPath: FileInfo.relativePath('/' + appInstallDir, '/' + libexecInstallDir) property string relativePluginsPath: FileInfo.relativePath('/' + appInstallDir, - '/' + pluginsInstallDir) + '/' + qtc.ide_plugin_path) property string relativeSearchPath: FileInfo.relativePath('/' + appInstallDir, '/' + resourcesInstallDir) } -- cgit v1.2.1