diff options
| author | Jan Blackquill <uhhadd@gmail.com> | 2020-12-20 23:27:14 -0500 |
|---|---|---|
| committer | Jan Blackquill <uhhadd@gmail.com> | 2020-12-23 04:30:30 +0000 |
| commit | 2ade8330d1c9d9ce89c526693dd706ca406b56bb (patch) | |
| tree | 59bee9fc60996eb04c2add0acda808c422faf490 | |
| parent | 92ed11c8236ef16d95df32197b5fec78db4464e0 (diff) | |
Add more paths to search in Library and Include probes
These paths are used by containerisation systems such as Flatpak;
searching in these by default makes building Qbs applications in
Flatpak et. al easier
Change-Id: I438ba1ffd66845ac1331791428135eb70105ff34
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | share/qbs/imports/qbs/Probes/IncludeProbe.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/Probes/LibraryProbe.qbs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/share/qbs/imports/qbs/Probes/IncludeProbe.qbs b/share/qbs/imports/qbs/Probes/IncludeProbe.qbs index 3c1059e64..6201cbc55 100644 --- a/share/qbs/imports/qbs/Probes/IncludeProbe.qbs +++ b/share/qbs/imports/qbs/Probes/IncludeProbe.qbs @@ -32,6 +32,8 @@ PathProbe { platformSearchPaths: qbs.targetOS.contains("unix") ? [ "/usr/include", "/usr/local/include", + "/include", + "/app/include", ] : [] platformEnvironmentPaths: { if (qbs.toolchain.contains('msvc')) diff --git a/share/qbs/imports/qbs/Probes/LibraryProbe.qbs b/share/qbs/imports/qbs/Probes/LibraryProbe.qbs index 0f4220730..7631eb441 100644 --- a/share/qbs/imports/qbs/Probes/LibraryProbe.qbs +++ b/share/qbs/imports/qbs/Probes/LibraryProbe.qbs @@ -60,7 +60,7 @@ PathProbe { else if (qbs.architecture === "x86") result = ["/usr/lib32", "/usr/lib/i386-linux-gnu"] } - result = result.concat(["/usr/lib", "/usr/local/lib"]); + result = result.concat(["/usr/lib", "/usr/local/lib", "/lib", "/app/lib"]); } return result; |