diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-06-16 17:29:45 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-06-20 07:26:17 +0000 |
| commit | d54d6aa77ead403bd2ab7599da73f1d423d6c584 (patch) | |
| tree | 85248d973ab6c41cb31bf65ed3e723fa4991b770 /mkspecs | |
| parent | 0325364316fded5a6dd443f8b9591e8400c3fc9b (diff) | |
| download | qtivi-d54d6aa77ead403bd2ab7599da73f1d423d6c584.tar.gz | |
ivigenerator: Fix build error in the COIN setup
On the CI, building the test is separated from building the tests,
because of that we can only use our internal virtualenv from the build
folder if it exists, if not we fallback to the installed version
Change-Id: Ibcdf2d58f0e99f59092ef20ac6fc9e4742cb782c
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/ivigenerator.prf | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index 089c65a..4894f49 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -28,11 +28,16 @@ QFACE_YAML = $$QFACE_ABS_PWD/$${QFACE_BASE_NAME}.yaml isEmpty(QFACE_MODULE_NAME): QFACE_MODULE_NAME = $$QFACE_BASE_NAME # Detect whether we are using the feature inside the qtivi repository -isEmpty(QTIVI_BUILD_ROOT): VIRTUALENV_PATH = $$[QT_HOST_BINS]/ivigenerator/qtivi_qface_virtualenv -else: VIRTUALENV_PATH = $$QTIVI_BUILD_ROOT/src/tools/ivigenerator/qtivi_qface_virtualenv - -isEmpty(QTIVI_ROOT): IVI_GENERATOR_PATH = $$[QT_HOST_BINS]/ivigenerator -else: IVI_GENERATOR_PATH = $$QTIVI_ROOT/src/tools/ivigenerator +VIRTUALENV_PATH = $$[QT_HOST_BINS]/ivigenerator/qtivi_qface_virtualenv +INTERNAL_VIRTUALENV_PATH = $$QTIVI_BUILD_ROOT/src/tools/ivigenerator/qtivi_qface_virtualenv +IVI_GENERATOR_PATH = $$[QT_HOST_BINS]/ivigenerator + +# Try to use the internal virtualenv when building qtivi +# Because of the two stage build of COIN, it might not exist, but the installed version should still be there +!isEmpty(QTIVI_BUILD_ROOT):exists(INTERNAL_VIRTUALENV_PATH) { + VIRTUALENV_PATH = $$INTERNAL_VIRTUALENV_PATH + IVI_GENERATOR_PATH = $$QTIVI_ROOT/src/tools/ivigenerator +} win32: VIRTUALENV_ACTIVATION = $$VIRTUALENV_PATH/Scripts/activate && else: VIRTUALENV_ACTIVATION = . $$VIRTUALENV_PATH/bin/activate && |