diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2017-02-09 15:05:58 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-02-10 09:01:10 +0000 |
| commit | ec702058e4e317e9b01604d8f707d35a1f4cb42b (patch) | |
| tree | 19aea2e3f646f1f4d98af7eb3a303a1a0d23fce9 /3rdparty | |
| parent | 74d8bb0c8590dec7d6106781b1aa460756425d8f (diff) | |
Make it possible to not build against the system libyaml and libarchive
Change-Id: Ia3dd28e778a334f10980b489b51b56fa6113f76b
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/libarchive.pri | 2 | ||||
| -rw-r--r-- | 3rdparty/libyaml.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/3rdparty/libarchive.pri b/3rdparty/libarchive.pri index a70afbb4..1b630a86 100644 --- a/3rdparty/libarchive.pri +++ b/3rdparty/libarchive.pri @@ -1,7 +1,7 @@ include(libz.pri) -!config_libarchive { +!config_libarchive|no-system-libarchive { load(fix-library-path) LIBARCHIVE_PATH = $$PWD/libarchive diff --git a/3rdparty/libyaml.pri b/3rdparty/libyaml.pri index 053efc43..cee5e710 100644 --- a/3rdparty/libyaml.pri +++ b/3rdparty/libyaml.pri @@ -1,5 +1,5 @@ -!config_libyaml { +!config_libyaml|no-system-libyaml { load(fix-library-path) LIBYAML_PATH = $$PWD/libyaml |