diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-05-09 17:10:15 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-05-29 07:58:41 +0000 |
| commit | 9d87ccfe6302ad05f5a8e3dcf5185a43946d8d73 (patch) | |
| tree | f3879e4c58dd3c2a6a3afe9c9c1d73d354ee6ae5 /mkspecs | |
| parent | 52ffe2ba5a1e5bdf0e3185c4e58f59c79c4aefcd (diff) | |
| download | qtivi-9d87ccfe6302ad05f5a8e3dcf5185a43946d8d73.tar.gz | |
Fix ivivgenerator.prf to work without the need to install it
To be able to run the generator in the qtivi repository itself, we
need to use the generator from the source directory as it might not
have been install yet.
Change-Id: Idafd60d41926c0a5814600d875a4119321abd96e
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/ivigenerator.prf | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index 5b9ffcd..b6105ac 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -13,10 +13,16 @@ isEmpty(QFACE_SOURCES): error("QFACE_SOURCES must be set!") # TODO get rid of this, and use the qface file name without extension by default isEmpty(QFACE_MODULE_NAME): error("QFACE_MODULE_NAME must be set!") -IVI_GENERATOR_PATH = $$[QT_HOST_BINS]/ivigenerator -win32: VIRTUALENV_ACTIVATION = $$IVI_GENERATOR_PATH/qtivi_qface_virtualenv/Scripts/activate && -else: VIRTUALENV_ACTIVATION = . $$IVI_GENERATOR_PATH/qtivi_qface_virtualenv/bin/activate && -IVI_GENERATOR = $$VIRTUALENV_ACTIVATION python3 $$[QT_HOST_BINS]/ivigenerator/generate.py +# 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 + +win32: VIRTUALENV_ACTIVATION = $$VIRTUALENV_PATH/Scripts/activate && +else: VIRTUALENV_ACTIVATION = . $$VIRTUALENV_PATH/bin/activate && +IVI_GENERATOR = $$VIRTUALENV_ACTIVATION python3 $$IVI_GENERATOR_PATH/generate.py # TODO make this work with multiple input files, or only support one QFACE_SOURCE qface_sources.output = $$QFACE_OUTPUT_DIR/$${QFACE_MODULE_NAME}.pri |