diff options
| author | Mike Krus <mike.krus@kdab.com> | 2017-09-11 15:34:15 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-09-12 07:43:49 +0000 |
| commit | eb1f349bb8e6e3d7fb47aae0812e2ad5018ec1f8 (patch) | |
| tree | 2a532dc667ac1cfade4a8dcb495c0c2b7810a772 | |
| parent | ebe3f84351ba4fac934ce8e03aae6d5c0ee5b6b4 (diff) | |
Fix for disabling generator completely
Cannot build ivivehiclefunctions at all or have tests for ivigenerator
Change-Id: I24291bfa4fa1074106ab0c9e29ba1301cd93e74c
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| -rw-r--r-- | src/imports/imports.pro | 2 | ||||
| -rw-r--r-- | src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro | 8 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 4 | ||||
| -rw-r--r-- | src/src.pro | 17 | ||||
| -rw-r--r-- | tests/auto/core/core.pro | 6 |
5 files changed, 22 insertions, 15 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index c42b57b..d70d6d5 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs SUBDIRS = core \ - vehiclefunctions \ media +qtHaveModule(ivivehiclefunctions): SUBDIRS += vehiclefunctions diff --git a/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro b/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro index 5e919f2..55cf52f 100644 --- a/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro +++ b/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro @@ -1,9 +1,5 @@ TARGET = vehiclefunction_simulator -PLUGIN_TYPE = qtivi -PLUGIN_EXTENDS = qtivi -PLUGIN_CLASS_NAME = QIviClimateControlBackendInterface - QT += core ivicore ivivehiclefunctions CONFIG += c++11 ivigenerator @@ -24,4 +20,8 @@ OTHER_FILES += \ $$PWD/doc/*.qdocconf \ $$PWD/doc/src/*.qdoc +PLUGIN_TYPE = qtivi +PLUGIN_EXTENDS = qtivi +PLUGIN_CLASS_NAME = QIviClimateControlBackendInterface + load(qt_plugin) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index deff5f5..549db23 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -SUBDIRS = ivivehiclefunctions \ - ivimedia +SUBDIRS = ivimedia +qtHaveModule(ivivehiclefunctions): SUBDIRS += ivivehiclefunctions diff --git a/src/src.pro b/src/src.pro index 388fbd7..ca05862 100644 --- a/src/src.pro +++ b/src/src.pro @@ -9,17 +9,22 @@ QT_FOR_CONFIG += geniviextras-private ivicore ivicore-private !qtConfig(host-tools-only) { !qtConfig(geniviextras-only) { SUBDIRS = ivicore \ - ivivehiclefunctions \ ivimedia \ plugins \ imports \ - doc \ + doc + + qtConfig(ivigenerator): { + SUBDIRS += ivivehiclefunctions + ivivehiclefunctions.depends = ivicore + !qtConfig(system-ivigenerator): ivivehiclefunctions.depends += sub-ivigenerator + plugins.depends += ivivehiclefunctions + imports.depends += ivivehiclefunctions + } - ivivehiclefunctions.depends = ivicore - !qtConfig(system-ivigenerator): ivivehiclefunctions.depends += sub-ivigenerator ivimedia.depends = ivicore - plugins.depends = ivivehiclefunctions ivimedia - imports.depends = ivivehiclefunctions ivimedia + plugins.depends += ivimedia + imports.depends += ivimedia } qtConfig(dlt): SUBDIRS += geniviextras diff --git a/tests/auto/core/core.pro b/tests/auto/core/core.pro index 87cdd76..dcd6bee 100644 --- a/tests/auto/core/core.pro +++ b/tests/auto/core/core.pro @@ -1,9 +1,11 @@ TEMPLATE = subdirs -SUBDIRS = ivigenerator \ - servicemanagertest \ +SUBDIRS = servicemanagertest \ qivipropertyattribute \ qiviproperty \ qiviabstractfeature \ queryparser \ qivisearchandbrowsemodel \ + +QT_FOR_CONFIG += ivicore +qtConfig(ivigenerator): SUBDIRS += ivigenerator |