diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2016-01-15 18:15:29 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2016-01-18 09:46:19 +0000 |
| commit | f0a69f63516e40f54cdcd15b4175d7611db81329 (patch) | |
| tree | 51bac56f368e8e45b39933b3f882e31912088f11 /3rdparty | |
| parent | d9d3e63bd5194ca24b8892e6be7c943083c43c1f (diff) | |
| download | qtapplicationmanager-f0a69f63516e40f54cdcd15b4175d7611db81329.tar.gz | |
Split base.pri into separate features that are loaded on demand.
This makes the whole build-system more maintainable, plus it speeds up
qmake runs.
Change-Id: I0020f6ba9250bdb101530bcce9fc804110fc3bb2
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/libarchive.pri | 2 | ||||
| -rw-r--r-- | 3rdparty/libarchive/libarchive.pro | 2 | ||||
| -rw-r--r-- | 3rdparty/libyaml.pri | 2 | ||||
| -rw-r--r-- | 3rdparty/libyaml/libyaml.pro | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/3rdparty/libarchive.pri b/3rdparty/libarchive.pri index d022545c..8396c094 100644 --- a/3rdparty/libarchive.pri +++ b/3rdparty/libarchive.pri @@ -2,6 +2,8 @@ include(libz.pri) !config_libarchive { + load(fix-library-path) + LIBARCHIVE_PATH = $$PWD/libarchive LIBARCHIVE_BUILD_PATH = $$shadowed($$LIBARCHIVE_PATH) diff --git a/3rdparty/libarchive/libarchive.pro b/3rdparty/libarchive/libarchive.pro index aeb5a04f..c3fe006c 100644 --- a/3rdparty/libarchive/libarchive.pro +++ b/3rdparty/libarchive/libarchive.pro @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = archive -include($$BASE_PRI) +load(am-config) CONFIG -= qt CONFIG += staticlib create_prl diff --git a/3rdparty/libyaml.pri b/3rdparty/libyaml.pri index 32dab30a..938e1400 100644 --- a/3rdparty/libyaml.pri +++ b/3rdparty/libyaml.pri @@ -1,5 +1,7 @@ !config_libyaml { + load(fix-library-path) + LIBYAML_PATH = $$PWD/libyaml LIBYAML_BUILD_PATH = $$shadowed($$LIBYAML_PATH) diff --git a/3rdparty/libyaml/libyaml.pro b/3rdparty/libyaml/libyaml.pro index 4c470ddb..4ce91a64 100644 --- a/3rdparty/libyaml/libyaml.pro +++ b/3rdparty/libyaml/libyaml.pro @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = yaml -include($$BASE_PRI) +load(am-config) CONFIG -= qt CONFIG += staticlib create_prl |