Get rid of ordered to build plugins and save a kitten
parent
a4e8038343
commit
e4a4281710
|
|
@ -1,7 +1,7 @@
|
||||||
TEMPLATE = subdirs
|
TEMPLATE = subdirs
|
||||||
|
|
||||||
# Note keep it ordered so the lib will be built first
|
# Note: In the loop at the end of this file the plugin
|
||||||
CONFIG += ordered
|
# dependency on the libs will be defined
|
||||||
SUBDIRS += libnymea-modbus libnymea-sunspec
|
SUBDIRS += libnymea-modbus libnymea-sunspec
|
||||||
|
|
||||||
PLUGIN_DIRS = \
|
PLUGIN_DIRS = \
|
||||||
|
|
@ -63,6 +63,12 @@ for(plugin, PLUGINS) {
|
||||||
exists($${plugin}) {
|
exists($${plugin}) {
|
||||||
SUBDIRS*= $${plugin}
|
SUBDIRS*= $${plugin}
|
||||||
message("- $${plugin}")
|
message("- $${plugin}")
|
||||||
|
# Make sure the libs will be built before the plugins
|
||||||
|
equals(plugin, "sunspec") {
|
||||||
|
$${plugin}.depends += libnymea-sunspec
|
||||||
|
} else {
|
||||||
|
$${plugin}.depends += libnymea-modbus
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
error("Invalid plugin \"$${plugin}\".")
|
error("Invalid plugin \"$${plugin}\".")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue