Use Qt5::* notation with target_link_libraries, & PUBLIC/PRIVATE interfaces Remove the few explicit Qt5 include dirs, not needed
ClosedPublic
Actions

Authored by kossebau on Apr 18 2016, 1:56 AM.

Details

Reviewers

nienhueser
rahn

Commits

R34:10aab9db0d03: Use Qt5::* notation with target_link_libraries, & PUBLIC/PRIVATE interfaces

Summary

Qt5::* notation is the usual way to refer to the imported cmake targets
representing the Qt5 modules/libs. The ${Qt5*_LIBRARIES} might be from
the transitional mode, right?

PUBLIC & PRIVATE link interfaces help to speed up compilation & linking,
because libs listed in PRIVATE will stay implementation detail of the lib
and not result in consumers of the lib also having those libs in the link
list. And it also reduces the amount of includes used, so less dirs to
search headers in.

Separate commit also removes the few explicit Qt5 include dirs, which are not needed:
The include dirs are automatically added, derived from the
imported targets for the Qt5 libs that are listed in
the TARGET_LINK_LIBRARIES command.

Another separate commit makes libastro completely Qt-independent:
so far the export header was relying on QtGlobal to reuse the Q_DECL_EXPORT/Q_DECL_IMPORT defines
cmake has a macro generate_export_header which can be used instead.
(triggered by removal of broad global include statements for Qt headers in toplevel CMakeLists.txt)

Test Plan

Build normal marble for desktop. Also build Android apk of Marble Maps and ran it successfully on my Jolla.

Diff Detail

Repository

R34 Marble

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

kossebau updated this revision to Diff 3392.Apr 18 2016, 1:56 AM

kossebau retitled this revision from to Use Qt5::* notation with target_link_libraries, & PUBLIC/PRIVATE interfaces Remove the few explicit Qt5 include dirs, not needed.

kossebau updated this object.

kossebau edited the test plan for this revision. (Show Details)

kossebau added reviewers: rahn, nienhueser.

I assume if this patch is okay it should be also backported to App/16.04.
Would then also pick up all the cleanup commits I just pushed before directly to master. Those seemed not worth a review, hopefully you agree.

Found this needs some fixes for the Android build. Build already works locally again, but still need to see if creating apks works, will only test tonight.

Fixed Android builds & made libastro completely Qt-less

Updating D1438: Use Qt5::* notation with target_link_libraries, & PUBLIC/PRIVATE interfaces

Created an APK of MarbleMaps which then ran on my Jolla :) So should be
quite okay now.

This patchset now completely relies on the modern Qt5 & cmake way
to derive things from targets listed in

As a sideeffect of the cleanup libabstro no longer saw Qt includes,
so its export header now longer could lean on Qt's macros. cmake has macro
for such export headers, which I propose to use instead (used not only all over KDE
now).

kossebau updated this object.Apr 19 2016, 12:27 AM

kossebau edited the test plan for this revision. (Show Details)

kossebau added a project: Marble.Apr 19 2016, 12:41 AM

Lovely, thanks. The old style was from transitional mode when we supported older cmake versions indeed.

I'm fine with pushing it as is and then resolve the Mac/Windows todos once we run into them (e.g. for Windows next time I do a release there).

This revision is now accepted and ready to land.Apr 24 2016, 2:25 PM

Closed by commit R34:10aab9db0d03: Use Qt5::* notation with target_link_libraries, & PUBLIC/PRIVATE interfaces (authored by kossebau). · Explain WhyApr 24 2016, 5:39 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			CMakeLists.txt (8 lines)
M			MarbleMacros.cmake (3 lines)
M			data/lang/CMakeLists.txt (2 lines)
M			examples/cpp/animation-video/CMakeLists.txt (1 line)
M			examples/cpp/basic-routing/CMakeLists.txt (1 line)
M			examples/cpp/custom-layers/CMakeLists.txt (1 line)
M			examples/cpp/geopainter/CMakeLists.txt (1 line)
M			examples/cpp/hello-marble/CMakeLists.txt (1 line)
M			examples/cpp/kml-inspector/CMakeLists.txt (1 line)
M			examples/cpp/kml-screenshot/CMakeLists.txt (1 line)
M			examples/cpp/map-controls/CMakeLists.txt (1 line)
M			examples/cpp/map-properties/CMakeLists.txt (1 line)
M			examples/cpp/marble-game/CMakeLists.txt (2 lines)
M			examples/cpp/marbleQuick2/CMakeLists.txt (1 line)
M			examples/cpp/overlay-rendering/CMakeLists.txt (1 line)
M			examples/cpp/pie-charts/CMakeLists.txt (1 line)
M			examples/cpp/reverse-geocoding/CMakeLists.txt (1 line)
M			examples/cpp/route-image/CMakeLists.txt (1 line)
M			examples/cpp/search/CMakeLists.txt (1 line)
M			examples/cpp/squad-interpolation/CMakeLists.txt (1 line)
M			examples/cpp/tour-preview/CMakeLists.txt (1 line)
M			examples/cpp/vehicletracking/CMakeLists.txt (1 line)
M			src/apps/behaim/CMakeLists.txt (39 lines)
M			src/apps/marble-maps/CMakeLists.txt (39 lines)
M			src/apps/marble-qt/CMakeLists.txt (12 lines)
M			src/apps/marble-touch/CMakeLists.txt (8 lines)
M			src/apps/marble-ui/CMakeLists.txt (32 lines)
M			src/lib/marble/CMakeLists.txt (50 lines)
M			src/lib/marble/declarative/CMakeLists.txt (21 lines)
M			src/plugins/positionprovider/qtpositioning/CMakeLists.txt (2 lines)
M			src/plugins/render/compass/CMakeLists.txt (2 lines)
M			src/plugins/render/crosshairs/CMakeLists.txt (1 line)
M			src/plugins/render/earthquake/CMakeLists.txt (2 lines)
M			src/plugins/render/foursquare/CMakeLists.txt (2 lines)
M			src/plugins/render/graticule/CMakeLists.txt (1 line)
M			src/plugins/render/opencachingcom/CMakeLists.txt (2 lines)
M			src/plugins/render/opendesktop/CMakeLists.txt (2 lines)
M			src/plugins/render/overviewmap/CMakeLists.txt (3 lines)
M			src/plugins/render/postalcode/CMakeLists.txt (2 lines)
M			src/plugins/render/weather/CMakeLists.txt (2 lines)
M			src/plugins/render/wikipedia/CMakeLists.txt (2 lines)
M			src/plugins/runner/gpx/CMakeLists.txt (2 lines)
M			src/plugins/runner/json/CMakeLists.txt (2 lines)
M			src/plugins/runner/local-osm-search/CMakeLists.txt (2 lines)
M			src/plugins/runner/open-source-routing-machine/CMakeLists.txt (2 lines)
M			tools/asc2kml/CMakeLists.txt (2 lines)
M			tools/constellations2kml/CMakeLists.txt (2 lines)
M			tools/dateline/CMakeLists.txt (2 lines)
M			tools/dso2kml/CMakeLists.txt (2 lines)
M			tools/iau2kml/CMakeLists.txt (2 lines)
M			tools/kml2cache/CMakeLists.txt (2 lines)
M			tools/kml2kml/CMakeLists.txt (2 lines)
M			tools/mapreproject/CMakeLists.txt (2 lines)
M			tools/maptheme-previewimage/CMakeLists.txt (2 lines)
M			tools/osm-addresses/CMakeLists.txt (2 lines)
M			tools/osm-sisyphus/CMakeLists.txt (2 lines)
M			tools/pnt2svg/CMakeLists.txt (2 lines)
M			tools/pntdel/CMakeLists.txt (2 lines)
M			tools/pntreplace/CMakeLists.txt (2 lines)
M			tools/poly2kml/CMakeLists.txt (2 lines)
M			tools/routing-instructions/CMakeLists.txt (2 lines)
M			tools/shp2pn2/CMakeLists.txt (2 lines)
M			tools/speaker-files/CMakeLists.txt (2 lines)
M			tools/stars/CMakeLists.txt (2 lines)
M			tools/svg2pnt/CMakeLists.txt (2 lines)
M			tools/tilecreator-srtm2/CMakeLists.txt (2 lines)
M			tools/tilecreator/CMakeLists.txt (2 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	3392	67353f1		Apr 18 2016, 1:56 AM	★	★
Diff 2	3404	7dac7fb	Fixed Android builds & made libastro completely Qt-less	Apr 19 2016, 12:09 AM	★	★
Diff 3	3494	d1a46d8	rMARBLE10aab9db0d03cdf17b0e3b3a6b60422276520354	Apr 24 2016, 5:38 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
960bacdd7057	38cd2dacf7d2	5f594ebcc20f	Friedrich W. H. Kossebau	Use Qt5::* notation with target_link_libraries, & PUBLIC/PRIVATE interfaces (Show More…)	Apr 18 2016, 10:52 PM
5f594ebcc20f	4c52dc5e573d	f2889d4708b6	Friedrich W. H. Kossebau	Remove the few explicit Qt5 include dirs, not needed (Show More…)	Apr 18 2016, 1:11 AM
f2889d4708b6	7f5d1285d064	7dac7fb8aa87	Friedrich W. H. Kossebau	Make libastro no longer depend on Qt/QtGlobal	Apr 18 2016, 10:59 PM

Use Qt5::* notation with target_link_libraries, & PUBLIC/PRIVATE interfaces Remove the few explicit Qt5 include dirs, not neededClosedPublicActions

Details

Diff Detail

Updating D1438: Use Qt5::* notation with target_link_libraries, & PUBLIC/PRIVATE interfaces

Revision ContentsChangeset List

Diff 3494

CMakeLists.txt

MarbleMacros.cmake

data/lang/CMakeLists.txt

examples/cpp/animation-video/CMakeLists.txt

examples/cpp/basic-routing/CMakeLists.txt

examples/cpp/custom-layers/CMakeLists.txt

examples/cpp/geopainter/CMakeLists.txt

examples/cpp/hello-marble/CMakeLists.txt

examples/cpp/kml-inspector/CMakeLists.txt

examples/cpp/kml-screenshot/CMakeLists.txt

examples/cpp/map-controls/CMakeLists.txt

examples/cpp/map-properties/CMakeLists.txt

examples/cpp/marble-game/CMakeLists.txt

examples/cpp/marbleQuick2/CMakeLists.txt

examples/cpp/overlay-rendering/CMakeLists.txt

examples/cpp/pie-charts/CMakeLists.txt

examples/cpp/reverse-geocoding/CMakeLists.txt

examples/cpp/route-image/CMakeLists.txt

examples/cpp/search/CMakeLists.txt

examples/cpp/squad-interpolation/CMakeLists.txt

examples/cpp/tour-preview/CMakeLists.txt

examples/cpp/vehicletracking/CMakeLists.txt

src/apps/behaim/CMakeLists.txt

src/apps/marble-maps/CMakeLists.txt

src/apps/marble-qt/CMakeLists.txt

src/apps/marble-touch/CMakeLists.txt

src/apps/marble-ui/CMakeLists.txt

src/lib/marble/CMakeLists.txt

src/lib/marble/declarative/CMakeLists.txt

src/plugins/positionprovider/qtpositioning/CMakeLists.txt

src/plugins/render/compass/CMakeLists.txt

src/plugins/render/crosshairs/CMakeLists.txt

src/plugins/render/earthquake/CMakeLists.txt

src/plugins/render/foursquare/CMakeLists.txt

src/plugins/render/graticule/CMakeLists.txt

src/plugins/render/opencachingcom/CMakeLists.txt

src/plugins/render/opendesktop/CMakeLists.txt

src/plugins/render/overviewmap/CMakeLists.txt

src/plugins/render/postalcode/CMakeLists.txt

src/plugins/render/weather/CMakeLists.txt

src/plugins/render/wikipedia/CMakeLists.txt

src/plugins/runner/gpx/CMakeLists.txt

src/plugins/runner/json/CMakeLists.txt

src/plugins/runner/local-osm-search/CMakeLists.txt

src/plugins/runner/open-source-routing-machine/CMakeLists.txt

tools/asc2kml/CMakeLists.txt

tools/constellations2kml/CMakeLists.txt

tools/dateline/CMakeLists.txt

tools/dso2kml/CMakeLists.txt

tools/iau2kml/CMakeLists.txt

tools/kml2cache/CMakeLists.txt

tools/kml2kml/CMakeLists.txt

tools/mapreproject/CMakeLists.txt

tools/maptheme-previewimage/CMakeLists.txt

tools/osm-addresses/CMakeLists.txt

tools/osm-sisyphus/CMakeLists.txt

tools/pnt2svg/CMakeLists.txt

tools/pntdel/CMakeLists.txt

tools/pntreplace/CMakeLists.txt

tools/poly2kml/CMakeLists.txt

tools/routing-instructions/CMakeLists.txt

tools/shp2pn2/CMakeLists.txt

tools/speaker-files/CMakeLists.txt

tools/stars/CMakeLists.txt

tools/svg2pnt/CMakeLists.txt

tools/tilecreator-srtm2/CMakeLists.txt

tools/tilecreator/CMakeLists.txt

Use Qt5::* notation with target_link_libraries, & PUBLIC/PRIVATE interfaces Remove the few explicit Qt5 include dirs, not needed
ClosedPublic
Actions

Revision Contents
Changeset List