[Marble-commits] KDE/kdeedu/marble

[Andrew Manson]

SVN commit 1007724 by mansona:

Moving all tests to a single directory. 
Also removing un needed #includes to fix the build


 A             examples/kml/NewYork.kml  
 M  +0 -1      src/lib/geodata/data/GeoDataFeature.h  
 M  +0 -1      src/lib/geodata/data/GeoDataGeometry.h  
 D             src/lib/tests/CMakeLists.txt  
 D             src/lib/tests/KMLTest.cpp  
 D             src/lib/tests/MarbleWidgetTest.cpp  
 D             src/lib/tests/PluginManagerTest.cpp  
 M  +7 -0      tests/CMakeLists.txt  
 AM            tests/KMLTest.cpp   src/lib/tests/KMLTest.cpp#1007340 [License: LGPL]
 AM            tests/MarbleWidgetTest.cpp   src/lib/tests/MarbleWidgetTest.cpp#1007340 [License: LGPL]
 AM            tests/PluginManagerTest.cpp   src/lib/tests/PluginManagerTest.cpp#1007340 [License: LGPL]


--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFeature.h #1007723:1007724
@@ -22,7 +22,6 @@
 
 #include "GeoDataObject.h"
 #include "GeoDataLookAt.h"
-#include "GeoGraphicsItem.h"
 
 #include "geodata_export.h"
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataGeometry.h #1007723:1007724
@@ -16,7 +16,6 @@
 
 
 #include "GeoDataObject.h"
-#include "GeoGraphicsItem.h"
 #include "global.h"
 
 #include "geodata_export.h"
--- trunk/KDE/kdeedu/marble/tests/CMakeLists.txt #1007723:1007724
@@ -58,3 +58,10 @@
 ############################
 
 marble_add_test( TestGeoDataParser )
+
+set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+
+marble_add_test( PluginManagerTest )
+marble_add_test( MarbleWidgetTest )
+add_definitions( -DCITIES_PATH="\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../data/placemarks/cityplacemarks.kml\\\"" )
+marble_add_test( KMLTest )
** trunk/KDE/kdeedu/marble/tests/KMLTest.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/marble/tests/MarbleWidgetTest.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/marble/tests/PluginManagerTest.cpp #property svn:mergeinfo
   +