[Marble-commits] KDE/kdeedu/marble

[Andrew Manson]

SVN commit 1009314 by mansona:

Rearanging the CMakeLists so that the include_directories() calls are called in the 
root CMakeLists and apply to the tests folder as well 


 M  +19 -0     CMakeLists.txt  
 M  +0 -17     src/CMakeLists.txt  
 M  +3 -3      src/MarbleTest.cpp  
 M  +5 -7      tests/CMakeLists.txt  


--- trunk/KDE/kdeedu/marble/CMakeLists.txt #1009313:1009314
@@ -250,6 +250,25 @@
 include( MarbleMacros )
 
 ####################################################
+# Add the include directories
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lib
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/AbstractLayer
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/Projections
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/geodata
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/geodata/data
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/geodata/graphicsitem
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/geodata/handlers/dgml
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/geodata/parser
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/geodata/writer
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/geodata/scene
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/graphicsview
+  ${CMAKE_CURRENT_BINARY_DIR}/src
+  ${CMAKE_CURRENT_BINARY_DIR}/src/lib
+)
+####################################################
 # Descend into subdirectories
 add_subdirectory(src)
 add_subdirectory(data)
--- trunk/KDE/kdeedu/marble/src/CMakeLists.txt #1009313:1009314
@@ -8,23 +8,6 @@
 add_definitions(-DMARBLE_DBUS)
 endif(BUILD_WITH_DBUS)
 
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/AbstractLayer
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/Projections
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/geodata
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/geodata/data
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/geodata/graphicsitem
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/geodata/handlers/dgml
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/geodata/parser
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/geodata/writer
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/geodata/scene
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/graphicsview
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}/lib
-)
-
 add_subdirectory( tilecreator )
 add_subdirectory( lib )
 add_subdirectory( plugins )
--- trunk/KDE/kdeedu/marble/src/MarbleTest.cpp #1009313:1009314
@@ -17,9 +17,9 @@
 #include <QtGui/QMessageBox>
 #include <QtGui/QFileDialog>
 
-#include <lib/global.h>
-#include <lib/MarbleWidget.h>
-#include <lib/MarbleModel.h>
+#include <global.h>
+#include <MarbleWidget.h>
+#include <MarbleModel.h>
 
 using namespace Marble;
 
--- trunk/KDE/kdeedu/marble/tests/CMakeLists.txt #1009313:1009314
@@ -54,17 +54,14 @@
 
 endif (QTONLY)
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib )
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/geodata )
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/geodata/data )
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/geodata/parser )
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/geodata/writer )
-marble_add_test( GeoPolygonTest )
+#FIXME: this stuff should actually be done only once and in the main CMake File!
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../src/plugins/render/osmannotate )
 
+
 ############################
 # Drop in New Tests
 ############################
-
+marble_add_test( GeoPolygonTest )
 marble_add_test( TestGeoDataParser )
 marble_add_test( TestGeoDataWriter )
 
@@ -74,3 +71,4 @@
 marble_add_test( MarbleWidgetTest )
 add_definitions( -DCITIES_PATH="\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../data/placemarks/cityplacemarks.kml\\\"" )
 marble_add_test( KMLTest )
+marble_add_test( TestOsmAnnotation )