aboutsummaryrefslogtreecommitdiffstats
path: root/qbs-resources
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2018-08-07 13:07:00 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-08-08 11:17:06 +0000
commit43e3b7ad7e5e68bae839feb74cdbcde48424c065 (patch)
tree6fa184fb4cc9b41a3a0c629716215691571626f8 /qbs-resources
parente1a4e7818d5ff26b81da8a0fa857c6f1699ad5ac (diff)
qbsbuildconfig: Do not pull in cpp if withCode is false
Task-number: QBS-1376 Change-Id: I79b470bc57d4188791209bca87a9042f7c385a84 Reviewed-by: Alexander Shevchenko <sav_ix@ukr.net> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'qbs-resources')
-rw-r--r--qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs7
1 files changed, 5 insertions, 2 deletions
diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
index 44c43310e..34e451267 100644
--- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -2,7 +2,10 @@ import qbs
import qbs.FileInfo
Module {
- Depends { name: "cpp" }
+ Depends {
+ condition: project.withCode
+ name: "cpp"
+ }
property bool enableUnitTests: false
property bool enableProjectFileUpdates: false
property bool enableRPath: true
@@ -30,7 +33,7 @@ Module {
property string relativePluginsPath: "../" + libDirName
property string relativeSearchPath: ".."
property stringList libRPaths: {
- if (enableRPath && cpp.rpathOrigin && product.targetInstallDir) {
+ if (enableRPath && project.withCode && cpp.rpathOrigin && product.targetInstallDir) {
return [FileInfo.joinPaths(cpp.rpathOrigin, FileInfo.relativePath(
FileInfo.joinPaths('/', product.targetInstallDir),
FileInfo.joinPaths('/', libDirName)))];