diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-02-23 19:05:47 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-02-24 15:50:14 +0000 |
| commit | c54ee74acdb9757989004005baf79e99be4c9417 (patch) | |
| tree | fc7ffd52d63eb34c936df961fb7ece5f8a74e151 | |
| parent | 11714b973304827e2893953d7c55a23e15e678f5 (diff) | |
Better dependency tracking when building 3rdparty modules
Make the component using the 3rdparty module depend directly on
the module instead of depending on the 3rdparty directory as a whole.
This will speedup compiling time when doing parallel builds and make
build more consistent when building only selected pieces of QtLocation.
Task-number: QTBUG-58943
Change-Id: I95b5ef8302109fb0c5fad760027a7a53d021bfa4
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| -rw-r--r-- | src/3rdparty/3rdparty.pro | 20 | ||||
| -rw-r--r-- | src/plugins/geoservices/geoservices.pro | 9 | ||||
| -rw-r--r-- | src/src.pro | 10 |
3 files changed, 13 insertions, 26 deletions
diff --git a/src/3rdparty/3rdparty.pro b/src/3rdparty/3rdparty.pro deleted file mode 100644 index efdd8e51..00000000 --- a/src/3rdparty/3rdparty.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += poly2tri -SUBDIRS += clipper -SUBDIRS += clip2tri - -qtHaveModule(opengl) { - linux|android: { - equals(QT_GCC_MAJOR_VERSION, 4): greaterThan(QT_GCC_MINOR_VERSION, 8) { - SUBDIRS += mapbox-gl-native - } - - greaterThan(QT_GCC_MAJOR_VERSION, 4) { - SUBDIRS += mapbox-gl-native - } - } - - ios|macos: { - SUBDIRS += mapbox-gl-native - } -} diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro index cedd159b..0c2a799e 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro @@ -5,15 +5,18 @@ SUBDIRS = nokia osm mapbox esri qtHaveModule(opengl) { linux|android: { equals(QT_GCC_MAJOR_VERSION, 4): greaterThan(QT_GCC_MINOR_VERSION, 8) { - SUBDIRS += mapboxgl + SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native + mapboxgl.depends = ../../3rdparty/mapbox-gl-native } greaterThan(QT_GCC_MAJOR_VERSION, 4) { - SUBDIRS += mapboxgl + SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native + mapboxgl.depends = ../../3rdparty/mapbox-gl-native } } ios|macos: { - SUBDIRS += mapboxgl + SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native + mapboxgl.depends = ../../3rdparty/mapbox-gl-native } } diff --git a/src/src.pro b/src/src.pro index a64ac534..d0a1ee4e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,13 +1,17 @@ TEMPLATE = subdirs +SUBDIRS += 3rdparty/clip2tri 3rdparty/clipper 3rdparty/poly2tri +3rdparty/clip2tri.depends = 3rdparty/clipper 3rdparty/poly2tri + SUBDIRS += positioning -plugins.depends += positioning 3rdparty +positioning.depends = 3rdparty/clip2tri qtHaveModule(quick) { - SUBDIRS += 3rdparty + plugins.depends += positioning SUBDIRS += location - location.depends += positioning 3rdparty + location.depends += positioning 3rdparty/clip2tri + plugins.depends += location SUBDIRS += imports |