forked from qt-creator/qt-creator
Use QTC_PLUGIN_DIRS also for generating the dependencies files
Use the same logic as in 27563451cb
to resolve out-of-source plugin
dependencies when generating the .pluginspec files.
Change-Id: I3a62527ff381aed0e83a7c37a50da403f0a6cece
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
@@ -17,11 +17,29 @@ include(../qtcreator.pri)
|
|||||||
# for substitution in the .pluginspec
|
# for substitution in the .pluginspec
|
||||||
dependencyList = "<dependencyList>"
|
dependencyList = "<dependencyList>"
|
||||||
for(dep, plugin_deps) {
|
for(dep, plugin_deps) {
|
||||||
include($$PWD/plugins/$$dep/$${dep}_dependencies.pri)
|
dependencies_file =
|
||||||
|
for(dir, QTC_PLUGIN_DIRS) {
|
||||||
|
exists($$dir/$$dep/$${dep}_dependencies.pri) {
|
||||||
|
dependencies_file = $$dir/$$dep/$${dep}_dependencies.pri
|
||||||
|
break()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
isEmpty(dependencies_file): \
|
||||||
|
error("Plugin dependency $$dep not found")
|
||||||
|
include($$dependencies_file)
|
||||||
dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\"/>"
|
dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\"/>"
|
||||||
}
|
}
|
||||||
for(dep, plugin_recmds) {
|
for(dep, plugin_recmds) {
|
||||||
include($$PWD/plugins/$$dep/$${dep}_dependencies.pri)
|
dependencies_file =
|
||||||
|
for(dir, QTC_PLUGIN_DIRS) {
|
||||||
|
exists($$dir/$$dep/$${dep}_dependencies.pri) {
|
||||||
|
dependencies_file = $$dir/$$dep/$${dep}_dependencies.pri
|
||||||
|
break()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
isEmpty(dependencies_file): \
|
||||||
|
error("Plugin dependency $$dep not found")
|
||||||
|
include($$dependencies_file)
|
||||||
dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>"
|
dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>"
|
||||||
}
|
}
|
||||||
dependencyList += " </dependencyList>"
|
dependencyList += " </dependencyList>"
|
||||||
|
Reference in New Issue
Block a user