[Marble-devel] [Differential] [Updated, 391 lines] D1438: Use Qt5::* notation with target_link_libraries, & PUBLIC/PRIVATE interfacesRemove the few explicit Qt5 include dirs, not needed

[kossebau (Friedrich W. H. Kossebau)]

kossebau updated this revision to Diff 3404.
kossebau added a comment.


  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).

REPOSITORY
  rMARBLE Marble

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D1438?vs=3392&id=3404

BRANCH
  cleanupBuildsystemFromOldQt

REVISION DETAIL
  https://phabricator.kde.org/D1438

AFFECTED FILES
  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/astro/CMakeLists.txt
  src/lib/astro/astrolib_export.h
  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/photo/CMakeLists.txt
  src/plugins/render/postalcode/CMakeLists.txt
  src/plugins/render/weather/CMakeLists.txt
  src/plugins/render/wikipedia/CMakeLists.txt
  src/plugins/runner/cyclestreets/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/mapquest/CMakeLists.txt
  src/plugins/runner/monav/CMakeLists.txt
  src/plugins/runner/nominatim-reversegeocoding/CMakeLists.txt
  src/plugins/runner/nominatim-search/CMakeLists.txt
  src/plugins/runner/open-source-routing-machine/CMakeLists.txt
  src/plugins/runner/openlocation-code-search/CMakeLists.txt
  src/plugins/runner/openrouteservice/CMakeLists.txt
  src/plugins/runner/yours/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

EMAIL PREFERENCES
  https://phabricator.kde.org/settings/panel/emailpreferences/

To: kossebau, rahn, nienhueser
Cc: marble-devel