[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] tests: remove unneeded definitions and out-commented cmake instructions
From:       Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date:       2012-10-31 19:40:34
Message-ID: 20121031194034.8F3D2A60C4 () git ! kde ! org
[Download RAW message or body]

Git commit b9653e81088d714d88c880c0766c146d710782ea by Bernhard Beschow.
Committed on 31/10/2012 at 16:52.
Pushed by beschow into branch 'master'.

remove unneeded definitions and out-commented cmake instructions

M  +0    -49   tests/CMakeLists.txt

http://commits.kde.org/marble/b9653e81088d714d88c880c0766c146d710782ea

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6a2b835..bc8a320 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -49,52 +49,6 @@ message( STATUS "Test Scripts have not been created" )
 endif( CMAKE_COMMAND AND CMAKE_CTEST_COMMAND )
 
 
-#############################################################
-# Add extra Libs for testing Plugins
-#############################################################
-#FIXME: Find a better way to do this!
-#set(osmannotate_SRCS
-#    ../src/plugins/render/osmannotate/TextAnnotation.cpp
-#    ../src/plugins/render/osmannotate/PlacemarkTextAnnotation.cpp
-#    ../src/plugins/render/osmannotate/GeoWidgetBubble.cpp
-#    ../src/plugins/render/osmannotate/TmpGraphicsItem.cpp
-#    ../src/plugins/render/osmannotate/TextEditor.cpp )
-
-#add_library(OsmAnnotatePluginTestLib SHARED ${osmannotate_SRCS} )
-#target_link_libraries( OsmAnnotatePluginTestLib
-#                            ${QT_QTGUI_LIBRARY}
-#                            ${QT_QTMAIN_LIBRARY}
-#                            ${QT_QTCORE_LIBRARY}
-#                            marblewidget )
-#
-#############################################################
-
-# GeoPolygon test
-if (QTONLY)
-  # ce: don't know why this is needed here - on win32 
-  # 'O2' is activated by default in release mode
-  if(NOT WIN32)
-    add_definitions (${QT_DEFINITIONS} -O3)
-  endif(NOT WIN32)
-
-  include_directories(
-    ${QT_INCLUDE_DIR}
-  )
-else (QTONLY)
-  if(NOT WIN32)
-    add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -O3) 
-  endif(NOT WIN32)
-
-  include_directories(
-    ${KDE4_INCLUDES}
-  )
-
-endif (QTONLY)
-
-#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
 ############################
@@ -115,7 +69,6 @@ marble_add_test( MapViewWidgetTest )        # Check mapview \
signals  marble_add_test( TestGeoPainter )           # no tests!
 marble_add_test( GeoPolygonTest )           # Loads an empty pnt file
 marble_add_test( RenderPluginTest )
-#marble_add_test( TestOsmAnnotation )
 
 ## GeoData Classes tests
 marble_add_test( TestGeoData )                  # Check parent, nodetype
@@ -130,5 +83,3 @@ marble_add_test( TestGeoDataCopy ${TestGeoDataCopy_SRCS} )
 add_definitions( -DCITIES_PATH="\\\"${CMAKE_CURRENT_SOURCE_DIR}/../data/placemarks/cityplacemarks.kml\\\"" \
)  marble_add_test( TestGeoDataWriter )            # Check parsing, writing, \
reloading and comparing kml files  marble_add_test( TestGeoDataPack )              # \
                Check pack and unpack to file
-
-


[prev in list] [next in list] [prev in thread] [next in thread]