From 22972b8830446436f15946812ac5fcd7446bb496 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 16 Feb 2023 20:01:38 +0200 Subject: [PATCH] Setup LD_LIBRARY_PATH variable for autotest runner. --- qbs/imports/VApp.qbs | 13 +++++++++++++ qbs/imports/VLib.qbs | 13 +++++++++++++ qbs/modules/buildconfig/buildconfig.qbs | 13 ------------- valentina.qbs | 13 ++++++++++++- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/qbs/imports/VApp.qbs b/qbs/imports/VApp.qbs index 3c33294d6..d89ec2999 100644 --- a/qbs/imports/VApp.qbs +++ b/qbs/imports/VApp.qbs @@ -86,4 +86,17 @@ CppApplication { qbs.install: true qbs.installDir: buildconfig.installBinaryPath } + + Group { + name: "Precompiled headers" + condition: buildconfig.enablePCH + prefix: product.sourceDirectory + "/" + files: { + var files = ["stable.h"]; + if (qbs.toolchain.contains("msvc")) + files.push("stable.cpp") + return files; + } + fileTags: ["cpp_pch_src"] + } } diff --git a/qbs/imports/VLib.qbs b/qbs/imports/VLib.qbs index 3f5636737..d1eaaa3a0 100644 --- a/qbs/imports/VLib.qbs +++ b/qbs/imports/VLib.qbs @@ -31,4 +31,17 @@ Library { cpp.minimumMacosVersion: buildconfig.minimumMacosVersion bundle.isBundle: buildconfig.frameworksBuild } + + Group { + name: "Precompiled headers" + condition: buildconfig.enablePCH + prefix: product.sourceDirectory + "/" + files: { + var files = ["stable.h"]; + if (qbs.toolchain.contains("msvc")) + files.push("stable.cpp") + return files; + } + fileTags: ["cpp_pch_src"] + } } diff --git a/qbs/modules/buildconfig/buildconfig.qbs b/qbs/modules/buildconfig/buildconfig.qbs index 85f6ca503..95daa2a16 100644 --- a/qbs/modules/buildconfig/buildconfig.qbs +++ b/qbs/modules/buildconfig/buildconfig.qbs @@ -865,17 +865,4 @@ Module { } vcs2.headerFileName: "vcsRepoState.h" - - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - prefix: product.sourceDirectory + "/" - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } } diff --git a/valentina.qbs b/valentina.qbs index 956488c5e..f74a9cd49 100644 --- a/valentina.qbs +++ b/valentina.qbs @@ -25,5 +25,16 @@ Project { ] qbsSearchPaths: "qbs" - AutotestRunner {} + AutotestRunner { + Depends { name: "buildconfig" } + + environment: { + var env = base; + + if (qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")) { + env.push("LD_LIBRARY_PATH=" + qbs.installRoot + qbs.installPrefix + "/" + buildconfig.libDirName + "/valentina"); + } + return env; + } + } }