aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2018-03-23 14:40:37 +0100
committerDominik Holland <dominik.holland@pelagicore.com>2018-04-04 08:31:33 +0000
commitf1bfd32b7b3616f7b8c17ab34678689a9d7ebbbc (patch)
treef6f800ab27a65f197b6916940bdc2b7681b61a7e
parent27aa5ebd75f0577f40b706072bfb013aa970890f (diff)
ivigenerator: Fix Makefile dependency problems
When using a developer-build and 'make -j100' you could run into Makefile errors. This is fixed by adding an additional target for the qtivi_qface_install folder. Change-Id: I8b1103d820a2f703a706102c89b791f33156f3ab Reviewed-by: Antti Hölttä <ahoelttae@luxoft.com>
-rw-r--r--src/tools/ivigenerator/qface_internal_build.pri6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tools/ivigenerator/qface_internal_build.pri b/src/tools/ivigenerator/qface_internal_build.pri
index 0ffcc9f..e81b591 100644
--- a/src/tools/ivigenerator/qface_internal_build.pri
+++ b/src/tools/ivigenerator/qface_internal_build.pri
@@ -27,6 +27,12 @@ qtivi_qface_virtualenv.commands = \
@echo "Set up virtualenv for qface, name: qtivi_qface_virtualenv"
QMAKE_EXTRA_TARGETS += qtivi_qface_virtualenv
+# This helper adds a target for the qtivi_qface_virtualenv folder
+# This target is needed for any target which has the folder as a dependency but not the python executable
+qtivi_qface_virtualenv_helper.target = qtivi_qface_virtualenv
+qtivi_qface_virtualenv_helper.depends = $${qtivi_qface_virtualenv.target}
+QMAKE_EXTRA_TARGETS += qtivi_qface_virtualenv_helper
+
equals(QMAKE_HOST.os, Windows): VIRTUALENV_ACTIVATION = qtivi_qface_virtualenv\Scripts\activate &&
else: VIRTUALENV_ACTIVATION = . qtivi_qface_virtualenv/bin/activate &&