Diffusion Marble 690b4afe03c8

Fix build-ability of installed examples
690b4afe03c8
Actions

Authored by kossebau on Aug 9 2016, 7:07 PM.

Description

Fix build-ability of installed examples

Summary:

creates fake headers in marble/ prefix in the build dir for headers which are not in lib/marble in the sources, to simulate install paths
update all installed CMakeLists.txt to cmake config file logic
fix missing installed sources or CMakeLists.txt
temporarily stop installing sources of marble-game, needs some work for paths of flags in qrc file

OPENCV-based examples were not touched, need a separate look

Test Plan: All installed example sources could be build with cmake & make, and ran.

Reviewers: Marble, rahn, sanjibanb, shentey, nienhueser

Differential Revision: https://phabricator.kde.org/D2373

Details

Committed

kossebau

Aug 9 2016, 8:09 PM

Differential Revision

D2373: Fix build-ability of installed examples

Parents

R34:32abd75af82b: Work on the correct placemark data instance

Branches

Unknown

Tags

Unknown

kossebau committed R34:690b4afe03c8: Fix build-ability of installed examples (authored by kossebau).Aug 9 2016, 8:09 PM

Changes (42)

				Path	Packages
	M			examples/cpp/CMakeLists.txt
	M			examples/cpp/Readme.txt
	M			examples/cpp/animation-video/main.cpp
	M			examples/cpp/basic-routing/CMakeLists.txt.external
	M			examples/cpp/basic-routing/main.cpp
	M			examples/cpp/custom-layers/CMakeLists.txt.external
	M			examples/cpp/custom-layers/main.cpp
	M			examples/cpp/geopainter/CMakeLists.txt.external
	M			examples/cpp/geopainter/main.cpp
	M			examples/cpp/hello-marble/CMakeLists.txt.external
	M			examples/cpp/hello-marble/main.cpp
	M			examples/cpp/kml-inspector/CMakeLists.txt.external
	M			examples/cpp/map-controls/CMakeLists.txt.external
	M			examples/cpp/map-properties/CMakeLists.txt.external
	M			examples/cpp/marble-game/CMakeLists.txt
	M			examples/cpp/marble-game/CMakeLists.txt.external
	M			examples/cpp/marble-game/ClickOnThat.cpp
	M			examples/cpp/marble-game/ClickOnThat.h
	M			examples/cpp/marble-game/CountryByFlag.cpp
	M			examples/cpp/marble-game/CountryByShape.cpp
	M			examples/cpp/marble-game/CountryByShape.h
	M			examples/cpp/marble-game/GameMainWindow.cpp
	M			examples/cpp/marble-game/GameMainWindow.h
	M			examples/cpp/marble-game/gamemain.cpp
	M			examples/cpp/marbleQuick2/CMakeLists.txt.external
	M			examples/cpp/overlay-rendering/CMakeLists.txt.external
	M			examples/cpp/overlay-rendering/main.cpp
	M			examples/cpp/reverse-geocoding/CMakeLists.txt.external
	M			examples/cpp/reverse-geocoding/main.cpp
	M			examples/cpp/search/CMakeLists.txt.external
	M			examples/cpp/search/main.cpp
	P			examples/cpp/squad-interpolation/CMakeLists.txt Copied from examples/cpp/basic-routing/CMakeLists.txt
	A			examples/cpp/squad-interpolation/CMakeLists.txt.external
	M			examples/cpp/squad-interpolation/squad-interpolation.cpp
	M			examples/cpp/squad-interpolation/squad-interpolation.h
	M			examples/cpp/tour-preview/tour-preview.cpp
	P			examples/cpp/vehicletracking/CMakeLists.txt Copied from examples/cpp/hello-marble/CMakeLists.txt
	A			examples/cpp/vehicletracking/CMakeLists.txt.external
	M			examples/cpp/vehicletracking/vehicletracking.cpp
	M			examples/cpp/vehicletracking/vehicletracking.h
	M			src/lib/marble/CMakeLists.txt
	M			src/lib/marble/MarbleMath.h