diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-08 10:52:49 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-09 13:16:14 +0000 |
| commit | 2c5e8e8d64862966d90586a0c7120225d7831567 (patch) | |
| tree | 98e35e18f1070388ce9caf50ebef8ef88a9762e8 /qtcreator.pri | |
| parent | 9c1f47399ea81bdd63e032fc4f655a3320ea47c6 (diff) | |
Support out of source support libraries
It was not possible to use QTC_LIB_DEPENDS if the library is not
in the Qt Creator source tree.
Provide a QTC_LIB_DIRS variable, similar to QTC_PLUGIN_DIRS.
Task-number: QTCREATORBUG-20382
Change-Id: I9120d221b6567f699881c0ad00d1f1e49ef3b920
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 777cf3fb76..cd899bc133 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -193,6 +193,13 @@ for(dir, QTC_PLUGIN_DIRS) { INCLUDEPATH += $$dir } +QTC_LIB_DIRS_FROM_ENVIRONMENT = $$(QTC_LIB_DIRS) +QTC_LIB_DIRS += $$split(QTC_LIB_DIRS_FROM_ENVIRONMENT, $$QMAKE_DIRLIST_SEP) +QTC_LIB_DIRS += $$IDE_SOURCE_TREE/src/libs +for(dir, QTC_LIB_DIRS) { + INCLUDEPATH += $$dir +} + CONFIG += \ depend_includepath \ no_include_pwd @@ -276,7 +283,16 @@ for(ever) { break() done_libs += $$QTC_LIB_DEPENDS for(dep, QTC_LIB_DEPENDS) { - include($$PWD/src/libs/$$dep/$${dep}_dependencies.pri) + dependencies_file = + for(dir, QTC_LIB_DIRS) { + exists($$dir/$$dep/$${dep}_dependencies.pri) { + dependencies_file = $$dir/$$dep/$${dep}_dependencies.pri + break() + } + } + isEmpty(dependencies_file): \ + error("Library dependency $$dep not found") + include($$dependencies_file) LIBS += -l$$qtLibraryName($$QTC_LIB_NAME) } QTC_LIB_DEPENDS = $$unique(QTC_LIB_DEPENDS) |