diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-06-02 19:10:12 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-06-03 14:11:53 +0000 |
| commit | a2d64478363fbad0d58b519ce994f6c0384fcd85 (patch) | |
| tree | 928ebb6f64d4b2b194a91aacd552e484cbaa1f80 | |
| parent | 2cb97da7c2edae1b04d994908b8261db7787ae7e (diff) | |
Do not use pathSuffixes in IncludeProbe
This is wrong - on Windows, INCLUDE variable already contains /include
suffix.
This also makes IncludeProbe consistent with LibraryProbe.
Change-Id: I166de8d4274842743886b0e234fff48688fd4c44
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/imports/qbs/Probes/IncludeProbe.qbs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/qbs/imports/qbs/Probes/IncludeProbe.qbs b/share/qbs/imports/qbs/Probes/IncludeProbe.qbs index fa2e44dd4..3c1059e64 100644 --- a/share/qbs/imports/qbs/Probes/IncludeProbe.qbs +++ b/share/qbs/imports/qbs/Probes/IncludeProbe.qbs @@ -29,7 +29,10 @@ ****************************************************************************/ PathProbe { - pathSuffixes: [ "include" ] + platformSearchPaths: qbs.targetOS.contains("unix") ? [ + "/usr/include", + "/usr/local/include", + ] : [] platformEnvironmentPaths: { if (qbs.toolchain.contains('msvc')) return [ "INCLUDE" ]; |