summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-09 19:07:46 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-09 20:09:42 (GMT)
commit690b4afe03c8e3828d2367f89e0f4ab43ddb313c (patch)
tree7c4da7996b9a32b21428445bb8617b184e7617bc
parent32abd75af82bb668aea837930185f9aae4398a66 (diff)
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
-rw-r--r--examples/cpp/CMakeLists.txt51
-rw-r--r--examples/cpp/Readme.txt7
-rw-r--r--examples/cpp/animation-video/main.cpp4
-rw-r--r--examples/cpp/basic-routing/CMakeLists.txt.external19
-rw-r--r--examples/cpp/basic-routing/main.cpp5
-rw-r--r--examples/cpp/custom-layers/CMakeLists.txt.external21
-rw-r--r--examples/cpp/custom-layers/main.cpp2
-rw-r--r--examples/cpp/geopainter/CMakeLists.txt.external19
-rw-r--r--examples/cpp/geopainter/main.cpp1
-rw-r--r--examples/cpp/hello-marble/CMakeLists.txt.external19
-rw-r--r--examples/cpp/hello-marble/main.cpp1
-rw-r--r--examples/cpp/kml-inspector/CMakeLists.txt.external21
-rw-r--r--examples/cpp/map-controls/CMakeLists.txt.external19
-rw-r--r--examples/cpp/map-properties/CMakeLists.txt.external19
-rw-r--r--examples/cpp/marble-game/CMakeLists.txt25
-rw-r--r--examples/cpp/marble-game/CMakeLists.txt.external39
-rw-r--r--examples/cpp/marble-game/ClickOnThat.cpp28
-rw-r--r--examples/cpp/marble-game/ClickOnThat.h2
-rw-r--r--examples/cpp/marble-game/CountryByFlag.cpp21
-rw-r--r--examples/cpp/marble-game/CountryByShape.cpp28
-rw-r--r--examples/cpp/marble-game/CountryByShape.h2
-rw-r--r--examples/cpp/marble-game/GameMainWindow.cpp36
-rw-r--r--examples/cpp/marble-game/GameMainWindow.h2
-rw-r--r--examples/cpp/marble-game/gamemain.cpp9
-rw-r--r--examples/cpp/marbleQuick2/CMakeLists.txt.external24
-rw-r--r--examples/cpp/overlay-rendering/CMakeLists.txt.external23
-rw-r--r--examples/cpp/overlay-rendering/main.cpp4
-rw-r--r--examples/cpp/reverse-geocoding/CMakeLists.txt.external21
-rw-r--r--examples/cpp/reverse-geocoding/main.cpp2
-rw-r--r--examples/cpp/search/CMakeLists.txt.external21
-rw-r--r--examples/cpp/search/main.cpp2
-rw-r--r--examples/cpp/squad-interpolation/CMakeLists.txt7
-rw-r--r--examples/cpp/squad-interpolation/CMakeLists.txt.external11
-rw-r--r--examples/cpp/squad-interpolation/squad-interpolation.cpp20
-rw-r--r--examples/cpp/squad-interpolation/squad-interpolation.h2
-rw-r--r--examples/cpp/tour-preview/tour-preview.cpp18
-rw-r--r--examples/cpp/vehicletracking/CMakeLists.txt4
-rw-r--r--examples/cpp/vehicletracking/CMakeLists.txt.external11
-rw-r--r--examples/cpp/vehicletracking/vehicletracking.cpp8
-rw-r--r--examples/cpp/vehicletracking/vehicletracking.h4
-rw-r--r--src/lib/marble/CMakeLists.txt2
-rw-r--r--src/lib/marble/MarbleMath.h2
42 files changed, 298 insertions, 288 deletions
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
index 33f1246..06001b0 100644
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@ -1,6 +1,55 @@
+# Generate fake headers
+# forwarding headers to simulate installed header paths with just a marble/ prefix
+# for headers which are located in other prefixes in the sources
+set(FAKEHEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/fakeheaders)
+
+function(generateFakeHeaders basedir)
+ foreach(_filename ${ARGN})
+ set(_fileContent "#include <${basedir}/${_filename}>")
+ file(WRITE ${FAKEHEADERS_DIR}/marble/${_filename} ${_fileContent})
+ endforeach()
+endfunction()
+
+# create clean dir
+file(REMOVE_RECURSE ${FAKEHEADERS_DIR})
+file(MAKE_DIRECTORY ${FAKEHEADERS_DIR}/marble)
+
+generateFakeHeaders(geodata/data
+ GeoDataCoordinates.h
+ GeoDataDocument.h
+ GeoDataFlyTo.h
+ GeoDataGeometry.h
+ GeoDataGroundOverlay.h
+ GeoDataIconStyle.h
+ GeoDataLatLonAltBox.h
+ GeoDataLinearRing.h
+ GeoDataLineString.h
+ GeoDataLookAt.h
+ GeoDataMultiGeometry.h
+ GeoDataPlacemark.h
+ GeoDataPlaylist.h
+ GeoDataPoint.h
+ GeoDataPolygon.h
+ GeoDataStyle.h
+ GeoDataStyleMap.h
+ GeoDataTour.h
+)
+generateFakeHeaders(geodata/parser
+ GeoDataTypes.h
+)
+generateFakeHeaders(routing
+ Route.h
+ RouteRequest.h
+ RoutingManager.h
+ RoutingModel.h
+)
+
# TODO: Change include directories for the library not to include all subdirectories,
# and change #include statements to use <marble/...> and "..." includes only
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/lib)
+include_directories(
+ ${CMAKE_SOURCE_DIR}/src/lib
+ ${FAKEHEADERS_DIR}
+)
set( MARBLE_EXAMPLES_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/apps/marble/examples )
diff --git a/examples/cpp/Readme.txt b/examples/cpp/Readme.txt
index 7f72586..5481d31 100644
--- a/examples/cpp/Readme.txt
+++ b/examples/cpp/Readme.txt
@@ -15,11 +15,8 @@ make
You can also use a local Marble version like this:
cd hello-marble
-cmake -DCMAKE_MODULE_PATH=~/marble/export/share/apps/cmake/modules \
- -DCMAKE_INCLUDE_PATH=~/marble/export/include \
- -DCMAKE_LIBRARY_PATH=~/marble/export/lib \
- .
+cmake -DCMAKE_PREFIX_PATH=~/marble/export .
make
-./hello-world
+./hello-marble
In the second example Marble is assumed to be installed to ~/marble/export.
diff --git a/examples/cpp/animation-video/main.cpp b/examples/cpp/animation-video/main.cpp
index e2ca600..4868e0d 100644
--- a/examples/cpp/animation-video/main.cpp
+++ b/examples/cpp/animation-video/main.cpp
@@ -15,8 +15,8 @@
*/
#include <marble/MarbleWidget.h>
-#include <GeoDataCoordinates.h>
-#include <GeoDataLineString.h>
+#include <marble/GeoDataCoordinates.h>
+#include <marble/GeoDataLineString.h>
#include <marble/RenderPlugin.h>
#include <marble/Quaternion.h>
diff --git a/examples/cpp/basic-routing/CMakeLists.txt.external b/examples/cpp/basic-routing/CMakeLists.txt.external
index 6406c5a..c7a9b5b 100644
--- a/examples/cpp/basic-routing/CMakeLists.txt.external
+++ b/examples/cpp/basic-routing/CMakeLists.txt.external
@@ -1,16 +1,9 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
-SET (TARGET basic-routing)
-PROJECT (${TARGET})
+cmake_minimum_required(VERSION 2.8.12)
-FIND_PACKAGE (Qt5Widgets REQUIRED)
-FIND_PACKAGE (Marble REQUIRED)
+project(basic-routing)
-INCLUDE_DIRECTORIES (
-${Qt5Widgets_INCLUDE_DIRS}
-${MARBLE_INCLUDE_DIR}
-)
+find_package(Qt5Widgets REQUIRED)
+find_package(Marble REQUIRED)
-SET (LIBS ${MARBLE_LIBRARIES} ${Qt5Widgets_LIBRARIES})
-
-ADD_EXECUTABLE (${TARGET} main.cpp)
-TARGET_LINK_LIBRARIES (${TARGET} ${LIBS})
+add_executable(basic-routing main.cpp)
+target_link_libraries(basic-routing Marble Qt5::Widgets)
diff --git a/examples/cpp/basic-routing/main.cpp b/examples/cpp/basic-routing/main.cpp
index f917b27..b1e22f5 100644
--- a/examples/cpp/basic-routing/main.cpp
+++ b/examples/cpp/basic-routing/main.cpp
@@ -9,10 +9,11 @@
//
#include <QApplication>
+
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
-#include <routing/RouteRequest.h>
-#include <routing/RoutingManager.h>
+#include <marble/RouteRequest.h>
+#include <marble/RoutingManager.h>
using namespace Marble;
diff --git a/examples/cpp/custom-layers/CMakeLists.txt.external b/examples/cpp/custom-layers/CMakeLists.txt.external
index 054021c..f44a154 100644
--- a/examples/cpp/custom-layers/CMakeLists.txt.external
+++ b/examples/cpp/custom-layers/CMakeLists.txt.external
@@ -1,18 +1,9 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
-SET (TARGET custom-layers)
-PROJECT (${TARGET})
+cmake_minimum_required(VERSION 2.8.12)
-FIND_PACKAGE (Qt5Core REQUIRED)
-FIND_PACKAGE (Qt5Widgets REQUIRED)
-FIND_PACKAGE (Marble REQUIRED)
+project(custom-layers)
-INCLUDE_DIRECTORIES (
-${Qt5Core_INCLUDE_DIRS}
-${Qt5Widgets_INCLUDE_DIRS}
-${MARBLE_INCLUDE_DIR}
-)
+find_package(Qt5Widgets REQUIRED)
+find_package(Marble REQUIRED)
-SET (LIBS ${MARBLE_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
-
-ADD_EXECUTABLE (${TARGET} main.cpp)
-TARGET_LINK_LIBRARIES (${TARGET} ${LIBS})
+add_executable(custom-layers main.cpp)
+target_link_libraries(custom-layers Marble Qt5::Widgets)
diff --git a/examples/cpp/custom-layers/main.cpp b/examples/cpp/custom-layers/main.cpp
index b5473d0..e13c85c 100644
--- a/examples/cpp/custom-layers/main.cpp
+++ b/examples/cpp/custom-layers/main.cpp
@@ -12,7 +12,7 @@
#include <marble/MarbleMap.h>
#include <marble/MarbleModel.h>
#include <marble/GeoPainter.h>
-#include <GeoDataLineString.h>
+#include <marble/GeoDataLineString.h>
#include <marble/LayerInterface.h>
#include <QTime>
diff --git a/examples/cpp/geopainter/CMakeLists.txt.external b/examples/cpp/geopainter/CMakeLists.txt.external
index 72ad266..4c30690 100644
--- a/examples/cpp/geopainter/CMakeLists.txt.external
+++ b/examples/cpp/geopainter/CMakeLists.txt.external
@@ -1,16 +1,9 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
-SET (TARGET geopainter)
-PROJECT (${TARGET})
+cmake_minimum_required(VERSION 2.8.12)
-FIND_PACKAGE (Qt5Widgets REQUIRED)
-FIND_PACKAGE (Marble REQUIRED)
+project(geopainter)
-INCLUDE_DIRECTORIES (
-${Qt5Widgets_INCLUDE_DIRS}
-${MARBLE_INCLUDE_DIR}
-)
+find_package(Qt5Widgets REQUIRED)
+find_package(Marble REQUIRED)
-SET (LIBS ${MARBLE_LIBRARIES} ${Qt5Widgets_LIBRARIES})
-
-ADD_EXECUTABLE (${TARGET} main.cpp)
-TARGET_LINK_LIBRARIES (${TARGET} ${LIBS})
+add_executable(geopainter main.cpp)
+target_link_libraries(geopainter Marble Qt5::Widgets)
diff --git a/examples/cpp/geopainter/main.cpp b/examples/cpp/geopainter/main.cpp
index 5e439d3..c485283 100644
--- a/examples/cpp/geopainter/main.cpp
+++ b/examples/cpp/geopainter/main.cpp
@@ -9,6 +9,7 @@
//
#include <QApplication>
+
#include <marble/MarbleWidget.h>
#include <marble/GeoPainter.h>
diff --git a/examples/cpp/hello-marble/CMakeLists.txt.external b/examples/cpp/hello-marble/CMakeLists.txt.external
index 3659fc6..ec225ee 100644
--- a/examples/cpp/hello-marble/CMakeLists.txt.external
+++ b/examples/cpp/hello-marble/CMakeLists.txt.external
@@ -1,16 +1,9 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
-SET (TARGET hello-marble)
-PROJECT (${TARGET})
+cmake_minimum_required(VERSION 2.8.12)
-FIND_PACKAGE (Qt5Widgets REQUIRED)
-FIND_PACKAGE (Marble REQUIRED)
+project(hello-marble)
-INCLUDE_DIRECTORIES (
-${Qt5Widgets_INCLUDE_DIRS}
-${MARBLE_INCLUDE_DIR}
-)
+find_package(Qt5Widgets REQUIRED)
+find_package(Marble REQUIRED)
-SET (LIBS ${MARBLE_LIBRARIES} ${Qt5Widgets_LIBRARIES})
-
-ADD_EXECUTABLE (${TARGET} main.cpp)
-TARGET_LINK_LIBRARIES (${TARGET} ${LIBS})
+add_executable(hello-marble main.cpp)
+target_link_libraries(hello-marble Marble Qt5::Widgets)
diff --git a/examples/cpp/hello-marble/main.cpp b/examples/cpp/hello-marble/main.cpp
index 2f2b34d..cf8a0ab 100644
--- a/examples/cpp/hello-marble/main.cpp
+++ b/examples/cpp/hello-marble/main.cpp
@@ -9,6 +9,7 @@
//
#include <QApplication>
+
#include <marble/MarbleWidget.h>
using namespace Marble;
diff --git a/examples/cpp/kml-inspector/CMakeLists.txt.external b/examples/cpp/kml-inspector/CMakeLists.txt.external
index d3a207b..aee0e49 100644
--- a/examples/cpp/kml-inspector/CMakeLists.txt.external
+++ b/examples/cpp/kml-inspector/CMakeLists.txt.external
@@ -1,18 +1,9 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
-SET (TARGET kml-inspector)
-PROJECT (${TARGET})
+cmake_minimum_required(VERSION 2.8.12)
-FIND_PACKAGE (Qt5Core REQUIRED)
-FIND_PACKAGE (Qt5Widgets REQUIRED)
-FIND_PACKAGE (Marble REQUIRED)
+project(kml-inspector)
-INCLUDE_DIRECTORIES (
-${Qt5Core_INCLUDE_DIRS}
-${Qt5Widgets_INCLUDE_DIRS}
-${MARBLE_INCLUDE_DIR}
-)
+find_package(Qt5Widgets REQUIRED)
+find_package(Marble REQUIRED)
-SET (LIBS ${MARBLE_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
-
-ADD_EXECUTABLE (${TARGET} main.cpp)
-TARGET_LINK_LIBRARIES (${TARGET} ${LIBS})
+add_executable(kml-inspector main.cpp)
+target_link_libraries(kml-inspector Marble Qt5::Widgets)
diff --git a/examples/cpp/map-controls/CMakeLists.txt.external b/examples/cpp/map-controls/CMakeLists.txt.external
index 610e1d9..a727cd6 100644
--- a/examples/cpp/map-controls/CMakeLists.txt.external
+++ b/examples/cpp/map-controls/CMakeLists.txt.external
@@ -1,16 +1,9 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
-SET (TARGET map-controls)
-PROJECT (${TARGET})
+cmake_minimum_required(VERSION 2.8.12)
-FIND_PACKAGE (Qt5Widgets REQUIRED)
-FIND_PACKAGE (Marble REQUIRED)
+project(map-controls)
-INCLUDE_DIRECTORIES (
-${Qt5Widgets_INCLUDE_DIRS}
-${MARBLE_INCLUDE_DIR}
-)
+find_package(Qt5Widgets REQUIRED)
+find_package(Marble REQUIRED)
-SET (LIBS ${MARBLE_LIBRARIES} ${Qt5Widgets_LIBRARIES})
-
-ADD_EXECUTABLE (${TARGET} main.cpp)
-TARGET_LINK_LIBRARIES (${TARGET} ${LIBS})
+add_executable(map-controls main.cpp)
+target_link_libraries(map-controls Marble Qt5::Widgets)
diff --git a/examples/cpp/map-properties/CMakeLists.txt.external b/examples/cpp/map-properties/CMakeLists.txt.external
index c2fd532..c87789b 100644
--- a/examples/cpp/map-properties/CMakeLists.txt.external
+++ b/examples/cpp/map-properties/CMakeLists.txt.external
@@ -1,16 +1,9 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
-SET (TARGET map-properties)
-PROJECT (${TARGET})
+cmake_minimum_required(VERSION 2.8.12)
-FIND_PACKAGE (Qt5Widgets REQUIRED)
-FIND_PACKAGE (Marble REQUIRED)
+project(map-properties)
-INCLUDE_DIRECTORIES (
-${Qt5Widgets_INCLUDE_DIRS}
-${MARBLE_INCLUDE_DIR}
-)
+find_package(Qt5Widgets REQUIRED)
+find_package(Marble REQUIRED)
-SET (LIBS ${MARBLE_LIBRARIES} ${Qt5Widgets_LIBRARIES})
-
-ADD_EXECUTABLE (${TARGET} main.cpp)
-TARGET_LINK_LIBRARIES (${TARGET} ${LIBS})
+add_executable(map-properties main.cpp)
+target_link_libraries(map-properties Marble Qt5::Widgets)
diff --git a/examples/cpp/marble-game/CMakeLists.txt b/examples/cpp/marble-game/CMakeLists.txt
index 6c8b18a..309fd56 100644
--- a/examples/cpp/marble-game/CMakeLists.txt
+++ b/examples/cpp/marble-game/CMakeLists.txt
@@ -6,6 +6,13 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
+set(${TARGET}_HDRS
+ GameMainWindow.h
+ CountryByShape.h
+ CountryByFlag.h
+ ClickOnThat.h
+)
+
set(${TARGET}_SRCS
gamemain.cpp
GameMainWindow.cpp
@@ -30,6 +37,20 @@ target_link_libraries(
)
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
-install( FILES ${${TARGET}_SRCS} DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
-install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt )
+# TODO: add to qrc and get from there
install( FILES MapTackRoundHeadRed.png MapTackRoundHeadGreen.png DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
+
+return()
+# TODO: qrc refers to lots of flags in marble sources
+# needs a custom variant of the qrc file (-> configure_file) and reading the flags via alias
+# TODO: do not install sources for now, MarblePlacemarkModel.h is not ready/good for public usages
+
+install( FILES
+ ${${TARGET}_HDRS}
+ ${${TARGET}_SRCS}
+ ${QML_FILES}
+ game.ui
+ marbleGame.qrc
+ DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET}
+)
+install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt )
diff --git a/examples/cpp/marble-game/CMakeLists.txt.external b/examples/cpp/marble-game/CMakeLists.txt.external
index a084a98..814a853 100644
--- a/examples/cpp/marble-game/CMakeLists.txt.external
+++ b/examples/cpp/marble-game/CMakeLists.txt.external
@@ -1,27 +1,30 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
-SET (TARGET marble-game)
-PROJECT (${TARGET})
+cmake_minimum_required(VERSION 2.8.12)
-FIND_PACKAGE (Qt5Core REQUIRED)
-FIND_PACKAGE (Qt5Gui REQUIRED)
-FIND_PACKAGE (Qt5Widgets REQUIRED)
-FIND_PACKAGE (Marble REQUIRED)
+project(marble-game)
-INCLUDE_DIRECTORIES (
-${Qt5Core_INCLUDE_DIRS}
-${Qt5Gui_INCLUDE_DIRS}
-${Qt5Widgets_INCLUDE_DIRS}
-${MARBLE_INCLUDE_DIR}
-)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Quick REQUIRED)
+find_package(Marble REQUIRED)
-SET (LIBS ${MARBLE_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_Widgets} ${Qt5Widgets_LIBRARIES})
+set(CMAKE_AUTOMOC TRUE)
-ADD_EXECUTABLE (
- ${TARGET}
+set(marble-game_SRCS
gamemain.cpp
GameMainWindow.cpp
CountryByShape.cpp
CountryByFlag.cpp
- ClickOnThat.cpp)
+ ClickOnThat.cpp
+)
+
+# TODO: qrc refers to lots of flags in marble sources
+# needs a custom variant of the qrc file (-> configure_file) and reading the flags via alias
+qt5_add_resources(marble-game_SRCS marbleGame.qrc)
+qt5_wrap_ui(marble-game_SRCS game.ui)
-TARGET_LINK_LIBRARIES (${TARGET} ${LIBS})
+add_executable(marble-game ${marble-game_SRCS})
+
+target_link_libraries(marble-game
+ Marble
+ Qt5::Widgets
+ Qt5::Quick
+)
diff --git a/examples/cpp/marble-game/ClickOnThat.cpp b/examples/cpp/marble-game/ClickOnThat.cpp
index 80b89b9..d696dd7 100644
--- a/examples/cpp/marble-game/ClickOnThat.cpp
+++ b/examples/cpp/marble-game/ClickOnThat.cpp
@@ -19,20 +19,20 @@
#include <QDir>
// Marble
-#include <MarbleWidget.h>
-#include <MarbleMap.h>
-#include <MarbleModel.h>
-#include <GeoDataTreeModel.h>
-#include <MarbleDirs.h>
-#include <MarblePlacemarkModel.h>
-
-#include <GeoDataDocument.h>
-#include <GeoDataPlacemark.h>
-#include <GeoDataStyle.h>
-#include <GeoDataStyleMap.h>
-#include <GeoDataIconStyle.h>
-
-#include <GeoDataTypes.h>
+#include <marble/MarbleWidget.h>
+#include <marble/MarbleMap.h>
+#include <marble/MarbleModel.h>
+#include <marble/GeoDataTreeModel.h>
+#include <marble/MarbleDirs.h>
+#include <marble/MarblePlacemarkModel.h>
+
+#include <marble/GeoDataDocument.h>
+#include <marble/GeoDataPlacemark.h>
+#include <marble/GeoDataStyle.h>
+#include <marble/GeoDataStyleMap.h>
+#include <marble/GeoDataIconStyle.h>
+
+#include <marble/GeoDataTypes.h>
namespace Marble
{
diff --git a/examples/cpp/marble-game/ClickOnThat.h b/examples/cpp/marble-game/ClickOnThat.h
index ed500fe..6b5b2e2 100644
--- a/examples/cpp/marble-game/ClickOnThat.h
+++ b/examples/cpp/marble-game/ClickOnThat.h
@@ -16,7 +16,7 @@
#include <QObject>
// Marble
-#include <GeoDataCoordinates.h>
+#include <marble/GeoDataCoordinates.h>
namespace Marble
{
diff --git a/examples/cpp/marble-game/CountryByFlag.cpp b/examples/cpp/marble-game/CountryByFlag.cpp
index de42de1..a209cdc 100644
--- a/examples/cpp/marble-game/CountryByFlag.cpp
+++ b/examples/cpp/marble-game/CountryByFlag.cpp
@@ -20,17 +20,16 @@
#include <QVariantList>
// Marble
-#include <MarbleWidget.h>
-#include <MarbleModel.h>
-#include <GeoDataTreeModel.h>
-#include <MarbleDirs.h>
-#include <MarbleDebug.h>
-#include <MarblePlacemarkModel.h>
-
-#include <GeoDataDocument.h>
-#include <GeoDataPlacemark.h>
-
-#include <GeoDataTypes.h>
+#include <marble/MarbleWidget.h>
+#include <marble/MarbleModel.h>
+#include <marble/GeoDataTreeModel.h>
+#include <marble/MarbleDirs.h>
+#include <marble/MarbleDebug.h>
+#include <marble/MarblePlacemarkModel.h>
+
+#include <marble/GeoDataDocument.h>
+#include <marble/GeoDataPlacemark.h>
+#include <marble/GeoDataTypes.h>
namespace Marble
{
diff --git a/examples/cpp/marble-game/CountryByShape.cpp b/examples/cpp/marble-game/CountryByShape.cpp
index c2b0400..a0d1a34 100644
--- a/examples/cpp/marble-game/CountryByShape.cpp
+++ b/examples/cpp/marble-game/CountryByShape.cpp
@@ -20,20 +20,20 @@
#include <QFileInfo>
// Marble
-#include <MarbleWidget.h>
-#include <MarbleModel.h>
-#include <GeoDataTreeModel.h>
-#include <MarblePlacemarkModel.h>
-#include <GeoDataTypes.h>
-
-#include <GeoDataDocument.h>
-#include <GeoDataPlacemark.h>
-#include <GeoDataGeometry.h>
-#include <GeoDataPolygon.h>
-#include <GeoDataLinearRing.h>
-#include <GeoDataMultiGeometry.h>
-#include <GeoDataPoint.h>
-#include <GeoDataCoordinates.h>
+#include <marble/MarbleWidget.h>
+#include <marble/MarbleModel.h>
+#include <marble/GeoDataTreeModel.h>
+#include <marble/MarblePlacemarkModel.h>
+#include <marble/GeoDataTypes.h>
+
+#include <marble/GeoDataDocument.h>
+#include <marble/GeoDataPlacemark.h>
+#include <marble/GeoDataGeometry.h>
+#include <marble/GeoDataPolygon.h>
+#include <marble/GeoDataLinearRing.h>
+#include <marble/GeoDataMultiGeometry.h>
+#include <marble/GeoDataPoint.h>
+#include <marble/GeoDataCoordinates.h>
namespace Marble
{
diff --git a/examples/cpp/marble-game/CountryByShape.h b/examples/cpp/marble-game/CountryByShape.h
index 794d771..b739d8a 100644
--- a/examples/cpp/marble-game/CountryByShape.h
+++ b/examples/cpp/marble-game/CountryByShape.h
@@ -15,7 +15,7 @@
#include <QObject>
// Marble
-#include <GeoDataCoordinates.h>
+#include <marble/GeoDataCoordinates.h>
namespace Marble
{
diff --git a/examples/cpp/marble-game/GameMainWindow.cpp b/examples/cpp/marble-game/GameMainWindow.cpp
index 8eb9b22..8c66cd1 100644
--- a/examples/cpp/marble-game/GameMainWindow.cpp
+++ b/examples/cpp/marble-game/GameMainWindow.cpp
@@ -32,24 +32,24 @@
#include <QFileInfo>
// Marble
-#include <MarbleDirs.h>
-#include <MarbleWidget.h>
-#include <MarbleMap.h>
-#include <MarbleModel.h>
-#include <GeoDataTreeModel.h>
-#include <RenderPlugin.h>
-#include <MarblePlacemarkModel.h>
-
-#include <GeoDataDocument.h>
-#include <GeoDataPlacemark.h>
-#include <GeoDataGeometry.h>
-#include <GeoDataMultiGeometry.h>
-#include <GeoDataPoint.h>
-#include <GeoDataCoordinates.h>
-#include <GeoDataPolygon.h>
-#include <GeoDataLinearRing.h>
-#include <GeoDataLatLonAltBox.h>
-#include <GeoDataTypes.h>
+#include <marble/MarbleDirs.h>
+#include <marble/MarbleWidget.h>
+#include <marble/MarbleMap.h>
+#include <marble/MarbleModel.h>
+#include <marble/GeoDataTreeModel.h>
+#include <marble/RenderPlugin.h>
+#include <marble/MarblePlacemarkModel.h>
+
+#include <marble/GeoDataDocument.h>
+#include <marble/GeoDataPlacemark.h>
+#include <marble/GeoDataGeometry.h>
+#include <marble/GeoDataMultiGeometry.h>
+#include <marble/GeoDataPoint.h>
+#include <marble/GeoDataCoordinates.h>
+#include <marble/GeoDataPolygon.h>
+#include <marble/GeoDataLinearRing.h>
+#include <marble/GeoDataLatLonAltBox.h>
+#include <marble/GeoDataTypes.h>
namespace Marble {
diff --git a/examples/cpp/marble-game/GameMainWindow.h b/examples/cpp/marble-game/GameMainWindow.h
index a8951ac..fe4c9eb 100644
--- a/examples/cpp/marble-game/GameMainWindow.h
+++ b/examples/cpp/marble-game/GameMainWindow.h
@@ -12,7 +12,7 @@
#ifndef MARBLE_GAMEMAINWINDOW_H
#define MARBLE_GAMEMAINWINDOW_H
-#include <GeoDataCoordinates.h>
+#include <marble/GeoDataCoordinates.h>
#include <QMainWindow>
diff --git a/examples/cpp/marble-game/gamemain.cpp b/examples/cpp/marble-game/gamemain.cpp
index fbc7fe3..531723c 100644
--- a/examples/cpp/marble-game/gamemain.cpp
+++ b/examples/cpp/marble-game/gamemain.cpp
@@ -12,11 +12,10 @@
#include "GameMainWindow.h"
-#include <MapThemeManager.h>
-#include <MarbleDirs.h>
-#include <MarbleDebug.h>
-#include <MarbleLocale.h>
-#include <MarbleGlobal.h>
+#include <marble/MarbleDirs.h>
+#include <marble/MarbleDebug.h>
+#include <marble/MarbleLocale.h>
+#include <marble/MarbleGlobal.h>
#include <QApplication>
#include <QDir>
diff --git a/examples/cpp/marbleQuick2/CMakeLists.txt.external b/examples/cpp/marbleQuick2/CMakeLists.txt.external
index c5051b5..67ac9a6 100644
--- a/examples/cpp/marbleQuick2/CMakeLists.txt.external
+++ b/examples/cpp/marbleQuick2/CMakeLists.txt.external
@@ -1,20 +1,10 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.8.11)
-SET (TARGET marbleQuick)
-PROJECT (${TARGET})
+cmake_minimum_required(VERSION 2.8.12)
-FIND_PACKAGE(Qt5Core REQUIRED)
-FIND_PACKAGE(Qt5Widgets REQUIRED)
-FIND_PACKAGE(Qt5Quick REQUIRED)
-FIND_PACKAGE (Marble REQUIRED)
+project(marbleQuick)
-INCLUDE_DIRECTORIES (
-${MARBLE_INCLUDE_DIR}
-${Qt5Core_INCLUDE_DIRS}
-${Qt5Widgets_INCLUDE_DIRS}
-${Qt5Quick_INCLUDE_DIRS}
-)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Quick REQUIRED)
+find_package(Marble REQUIRED)
-SET (LIBS ${LIBS} ${MARBLE_LIBRARIES} ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_LIBRARIES} ${Qt5Quick_LIBRARIES})
-
-ADD_EXECUTABLE (${TARGET} main.cpp)
-TARGET_LINK_LIBRARIES (${TARGET} ${LIBS})
+add_executable(marbleQuick main.cpp)
+target_link_libraries(marbleQuick Marble Qt5::Widgets Qt5::Quick)
diff --git a/examples/cpp/overlay-rendering/CMakeLists.txt.external b/examples/cpp/overlay-rendering/CMakeLists.txt.external
index 35255e5..bedba51 100644
--- a/examples/cpp/overlay-rendering/CMakeLists.txt.external
+++ b/examples/cpp/overlay-rendering/CMakeLists.txt.external
@@ -1,20 +1,9 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
-SET (TARGET overlay-rendering)
-PROJECT (${TARGET})
+cmake_minimum_required(VERSION 2.8.12)
-FIND_PACKAGE (Qt5Core REQUIRED)
-FIND_PACKAGE (Qt5Gui REQUIRED)
-FIND_PACKAGE (Qt5Widgets REQUIRED)
-FIND_PACKAGE (Marble REQUIRED)
+project(overlay-rendering)
-INCLUDE_DIRECTORIES (
-${Qt5Core_INCLUDE_DIRS}
-${Qt5Gui_INCLUDE_DIRS}
-${Qt5Widgets_INCLUDE_DIRS}
-${MARBLE_INCLUDE_DIR}
-)
+find_package(Qt5Widgets REQUIRED)
+find_package(Marble REQUIRED)
-SET (LIBS ${MARBLE_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_Widgets} ${Qt5Widgets_LIBRARIES})
-
-ADD_EXECUTABLE (${TARGET} main.cpp)
-TARGET_LINK_LIBRARIES (${TARGET} ${LIBS})
+add_executable(overlay-rendering main.cpp)
+target_link_libraries(overlay-rendering Marble Qt5::Widgets)
diff --git a/examples/cpp/overlay-rendering/main.cpp b/examples/cpp/overlay-rendering/main.cpp
index 6f345da..bd39642 100644
--- a/examples/cpp/overlay-rendering/main.cpp
+++ b/examples/cpp/overlay-rendering/main.cpp
@@ -4,8 +4,8 @@
#include <QImage>
#include <marble/MarbleWidget.h>
-#include <GeoDataDocument.h>
-#include <GeoDataGroundOverlay.h>
+#include <marble/GeoDataDocument.h>
+#include <marble/GeoDataGroundOverlay.h>
#include <marble/GeoDataTreeModel.h>
#include <marble/MarbleModel.h>
diff --git a/examples/cpp/reverse-geocoding/CMakeLists.txt.external b/examples/cpp/reverse-geocoding/CMakeLists.txt.external
index 44601fd..dfcc5c2 100644
--- a/examples/cpp/reverse-geocoding/CMakeLists.txt.external
+++ b/examples/cpp/reverse-geocoding/CMakeLists.txt.external
@@ -1,18 +1,9 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
-SET (TARGET reverse-geocoding)
-PROJECT (${TARGET})
+cmake_minimum_required(VERSION 2.8.12)
-FIND_PACKAGE (Qt5Core REQUIRED)
-FIND_PACKAGE (Qt5Widgets REQUIRED)
-FIND_PACKAGE (Marble REQUIRED)
+project(reverse-geocoding)
-INCLUDE_DIRECTORIES (
-${Qt5Core_INCLUDE_DIRS}
-${Qt5Widgets_INCLUDE_DIRS}
-${MARBLE_INCLUDE_DIR}
-)
+find_package(Qt5Widgets REQUIRED)
+find_package(Marble REQUIRED)
-SET (LIBS ${MARBLE_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
-
-ADD_EXECUTABLE (${TARGET} main.cpp)
-TARGET_LINK_LIBRARIES (${TARGET} ${LIBS})
+add_executable(reverse-geocoding main.cpp)
+target_link_libraries(reverse-geocoding Marble Qt5::Widgets)
diff --git a/examples/cpp/reverse-geocoding/main.cpp b/examples/cpp/reverse-geocoding/main.cpp
index b0ad31e..0e07094 100644
--- a/examples/cpp/reverse-geocoding/main.cpp
+++ b/examples/cpp/reverse-geocoding/main.cpp
@@ -14,7 +14,7 @@
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
#include <marble/ReverseGeocodingRunnerManager.h>
-#include <GeoDataPlacemark.h>
+#include <marble/GeoDataPlacemark.h>
using namespace Marble;
diff --git a/examples/cpp/search/CMakeLists.txt.external b/examples/cpp/search/CMakeLists.txt.external
index ef2810d..4e9c412 100644
--- a/examples/cpp/search/CMakeLists.txt.external
+++ b/examples/cpp/search/CMakeLists.txt.external
@@ -1,18 +1,9 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
-SET (TARGET search)
-PROJECT (${TARGET})
+cmake_minimum_required(VERSION 2.8.12)
-FIND_PACKAGE (Qt5Core REQUIRED)
-FIND_PACKAGE (Qt5Widgets REQUIRED)
-FIND_PACKAGE (Marble REQUIRED)
+project(search)
-INCLUDE_DIRECTORIES (
-${Qt5Core_INCLUDE_DIRS}
-${Qt5Widgets_INCLUDE_DIRS}
-${MARBLE_INCLUDE_DIR}
-)
+find_package(Qt5Widgets REQUIRED)
+find_package(Marble REQUIRED)
-SET (LIBS ${MARBLE_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
-
-ADD_EXECUTABLE (${TARGET} main.cpp)
-TARGET_LINK_LIBRARIES (${TARGET} ${LIBS})
+add_executable(search main.cpp)
+target_link_libraries(search Marble Qt5::Widgets)
diff --git a/examples/cpp/search/main.cpp b/examples/cpp/search/main.cpp
index 477dbaf..79a96bb 100644
--- a/examples/cpp/search/main.cpp
+++ b/examples/cpp/search/main.cpp
@@ -14,7 +14,7 @@
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
#include <marble/SearchRunnerManager.h>
-#include <GeoDataPlacemark.h>
+#include <marble/GeoDataPlacemark.h>
using namespace Marble;
diff --git a/examples/cpp/squad-interpolation/CMakeLists.txt b/examples/cpp/squad-interpolation/CMakeLists.txt
index fa627c6..8d0a6c8 100644
--- a/examples/cpp/squad-interpolation/CMakeLists.txt
+++ b/examples/cpp/squad-interpolation/CMakeLists.txt
@@ -6,10 +6,15 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
+set( ${TARGET}_HDR squad-interpolation.h)
set( ${TARGET}_SRC squad-interpolation.cpp)
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries(${TARGET} marblewidget)
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
-install( FILES ${${TARGET}_SRC} DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
+
+return()
+# TODO: do not install sources for now, MarblePlacemarkModel.h is not ready/good for public usages
+install( FILES ${${TARGET}_SRC} ${${TARGET}_HDR} DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
+install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt )
diff --git a/examples/cpp/squad-interpolation/CMakeLists.txt.external b/examples/cpp/squad-interpolation/CMakeLists.txt.external
new file mode 100644
index 0000000..8728f54
--- /dev/null
+++ b/examples/cpp/squad-interpolation/CMakeLists.txt.external
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.8.12)
+
+project(squad-interpolation)
+
+find_package(Qt5Widgets REQUIRED)
+find_package(Marble REQUIRED)
+
+set(CMAKE_AUTOMOC TRUE)
+
+add_executable(squad-interpolation squad-interpolation.cpp)
+target_link_libraries(squad-interpolation Marble Qt5::Widgets)
diff --git a/examples/cpp/squad-interpolation/squad-interpolation.cpp b/examples/cpp/squad-interpolation/squad-interpolation.cpp
index dddfce4..e6da44a 100644
--- a/examples/cpp/squad-interpolation/squad-interpolation.cpp
+++ b/examples/cpp/squad-interpolation/squad-interpolation.cpp
@@ -10,16 +10,16 @@
#include "squad-interpolation.h"
-#include <MarbleWidget.h>
-#include <MarbleGlobal.h>
-#include <GeoDataDocument.h>
-#include <GeoDataPlacemark.h>
-#include <GeoDataLineString.h>
-#include <GeoDataTreeModel.h>
-#include <MarblePlacemarkModel.h>
-#include <GeoDataTypes.h>
-#include <MarbleMath.h>
-#include <ViewportParams.h>
+#include <marble/MarbleWidget.h>
+#include <marble/MarbleGlobal.h>
+#include <marble/GeoDataDocument.h>
+#include <marble/GeoDataPlacemark.h>
+#include <marble/GeoDataLineString.h>
+#include <marble/GeoDataTreeModel.h>
+#include <marble/MarblePlacemarkModel.h>
+#include <marble/GeoDataTypes.h>
+#include <marble/MarbleMath.h>
+#include <marble/ViewportParams.h>
#include <QApplication>
#include <QTimer>
diff --git a/examples/cpp/squad-interpolation/squad-interpolation.h b/examples/cpp/squad-interpolation/squad-interpolation.h
index a5bc773..0f7db08 100644
--- a/examples/cpp/squad-interpolation/squad-interpolation.h
+++ b/examples/cpp/squad-interpolation/squad-interpolation.h
@@ -15,7 +15,7 @@
#include <marble/MarbleMap.h>
#include <marble/MarbleModel.h>
#include <marble/GeoPainter.h>
-#include <GeoDataLineString.h>
+#include <marble/GeoDataLineString.h>
#include <marble/LayerInterface.h>
#include <QApplication>
diff --git a/examples/cpp/tour-preview/tour-preview.cpp b/examples/cpp/tour-preview/tour-preview.cpp
index 96d23b3..de317c8 100644
--- a/examples/cpp/tour-preview/tour-preview.cpp
+++ b/examples/cpp/tour-preview/tour-preview.cpp
@@ -15,18 +15,18 @@
#include <marble/MarbleWidget.h>
#include <marble/MarbleMath.h>
-#include <GeoDataCoordinates.h>
-#include <GeoDataLineString.h>
+#include <marble/GeoDataCoordinates.h>
+#include <marble/GeoDataLineString.h>
#include <marble/RenderPlugin.h>
#include <marble/MarbleModel.h>
-#include <marble/routing/Route.h>
-#include <marble/routing/RoutingManager.h>
-#include <marble/routing/RoutingModel.h>
+#include <marble/Route.h>
+#include <marble/RoutingManager.h>
+#include <marble/RoutingModel.h>
#include <marble/TourPlayback.h>
-#include <marble/geodata/data/GeoDataTour.h>
-#include <marble/geodata/data/GeoDataPlaylist.h>
-#include <marble/geodata/data/GeoDataFlyTo.h>
-#include <marble/geodata/data/GeoDataLookAt.h>
+#include <marble/GeoDataTour.h>
+#include <marble/GeoDataPlaylist.h>
+#include <marble/GeoDataFlyTo.h>
+#include <marble/GeoDataLookAt.h>
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc/imgproc.hpp>
diff --git a/examples/cpp/vehicletracking/CMakeLists.txt b/examples/cpp/vehicletracking/CMakeLists.txt
index 712c40a..fe530f2 100644
--- a/examples/cpp/vehicletracking/CMakeLists.txt
+++ b/examples/cpp/vehicletracking/CMakeLists.txt
@@ -6,10 +6,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
+set( ${TARGET}_HDR vehicletracking.h)
set( ${TARGET}_SRC vehicletracking.cpp)
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries(${TARGET} marblewidget)
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
-install( FILES ${${TARGET}_SRC} DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
+install( FILES ${${TARGET}_SRC} ${${TARGET}_HDR} DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
+install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt )
diff --git a/examples/cpp/vehicletracking/CMakeLists.txt.external b/examples/cpp/vehicletracking/CMakeLists.txt.external
new file mode 100644
index 0000000..4b62942
--- /dev/null
+++ b/examples/cpp/vehicletracking/CMakeLists.txt.external
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.8.12)
+
+project(vehicletracking)
+
+find_package(Qt5Widgets REQUIRED)
+find_package(Marble REQUIRED)
+
+set(CMAKE_AUTOMOC TRUE)
+
+add_executable(vehicletracking vehicletracking.cpp)
+target_link_libraries(vehicletracking Marble Qt5::Widgets)
diff --git a/examples/cpp/vehicletracking/vehicletracking.cpp b/examples/cpp/vehicletracking/vehicletracking.cpp
index dbb07aa..e1747bb 100644
--- a/examples/cpp/vehicletracking/vehicletracking.cpp
+++ b/examples/cpp/vehicletracking/vehicletracking.cpp
@@ -19,10 +19,10 @@
#include <marble/MarbleWidget.h>
#include <marble/MarbleGlobal.h>
-#include <GeoDataDocument.h>
-#include <GeoDataPlacemark.h>
-#include <GeoDataLineString.h>
-#include <GeoDataTreeModel.h>
+#include <marble/GeoDataDocument.h>
+#include <marble/GeoDataPlacemark.h>
+#include <marble/GeoDataLineString.h>
+#include <marble/GeoDataTreeModel.h>
#include <marble/MarbleModel.h>
diff --git a/examples/cpp/vehicletracking/vehicletracking.h b/examples/cpp/vehicletracking/vehicletracking.h
index d7a8561..fd2d8a0 100644
--- a/examples/cpp/vehicletracking/vehicletracking.h
+++ b/examples/cpp/vehicletracking/vehicletracking.h
@@ -13,8 +13,8 @@
class QTimer;
-#include <GeoDataCoordinates.h>
-#include <GeoDataPlacemark.h>
+#include <marble/GeoDataCoordinates.h>
+#include <marble/GeoDataPlacemark.h>
#include <QWidget>
#include <QObject>
diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
index 3d01823..cd22c4e 100644
--- a/src/lib/marble/CMakeLists.txt
+++ b/src/lib/marble/CMakeLists.txt
@@ -507,6 +507,7 @@ install( FILES
TileLevelRangeWidget.h
QtMarbleConfigDialog.h
global.h
+ MarbleMath.h
MarbleColors.h
MarbleGlobal.h
MarbleLocale.h
@@ -566,6 +567,7 @@ install( FILES
geodata/data/Serializable.h
geodata/geodata_export.h
geodata/parser/GeoDocument.h
+ geodata/parser/GeoDataTypes.h
geodata/writer/GeoWriter.h
routing/RoutingWidget.h
routing/RoutingManager.h
diff --git a/src/lib/marble/MarbleMath.h b/src/lib/marble/MarbleMath.h
index b6f29d9..0643def 100644
--- a/src/lib/marble/MarbleMath.h
+++ b/src/lib/marble/MarbleMath.h
@@ -14,7 +14,7 @@
#include <QtGlobal>
-#include <GeoDataCoordinates.h>
+#include "GeoDataCoordinates.h"
#include <math.h>