diff --git a/src/plugins/runner/gpx/CMakeLists.txt b/src/plugins/runner/gpx/CMakeLists.txt index 231442106..7771286ab 100644 --- a/src/plugins/runner/gpx/CMakeLists.txt +++ b/src/plugins/runner/gpx/CMakeLists.txt @@ -1,71 +1,72 @@ PROJECT( GpxPlugin ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/handlers ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDE_DIR} ) set( gpx_handlers_SRCS handlers/GPXElementDictionary.cpp handlers/GPXgpxTagHandler.cpp handlers/GPXnameTagHandler.cpp handlers/GPXdescTagHandler.cpp handlers/GPXtypeTagHandler.cpp handlers/GPXtrkTagHandler.cpp handlers/GPXtrkptTagHandler.cpp handlers/GPXtrksegTagHandler.cpp handlers/GPXwptTagHandler.cpp handlers/GPXtimeTagHandler.cpp handlers/GPXeleTagHandler.cpp handlers/GPXextensionsTagHandler.cpp handlers/GPXTrackPointExtensionTagHandler.cpp handlers/GPXhrTagHandler.cpp handlers/GPXrteTagHandler.cpp handlers/GPXrteptTagHandler.cpp handlers/GPXcmtTagHandler.cpp handlers/GPXlinkTagHandler.cpp handlers/GPXurlTagHandler.cpp handlers/GPXurlnameTagHandler.cpp ) set( gpx_SRCS GpxParser.cpp GpxPlugin.cpp GpxRunner.cpp ) marble_add_plugin( GpxPlugin ${gpx_SRCS} ${gpx_handlers_SRCS} ) install(FILES marble_gpx.desktop DESTINATION ${APPS_INSTALL_DIR}) if( BUILD_MARBLE_TESTS ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/tests ) set( TestTrack_SRCS tests/TestTrack.cpp GpxParser.cpp ${gpx_handlers_SRCS} ) qt_generate_moc( tests/TestTrack.cpp ${CMAKE_CURRENT_BINARY_DIR}/TestTrack.moc ) include_directories( ${CMAKE_CURRENT_BINARY_DIR}/tests ) include_directories(${Qt5Test_INCLUDE_DIRS}) set( TestTrack_SRCS TestTrack.moc ${TestTrack_SRCS} ) add_executable( TestTrack ${TestTrack_SRCS} ) target_link_libraries( TestTrack ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${MARBLEWIDGET} ) target_link_libraries( TestTrack ${Qt5Test_LIBRARIES}) set_target_properties( TestTrack PROPERTIES COMPILE_FLAGS "-DDATA_PATH=\"\\\"${DATA_PATH}\\\"\" -DPLUGIN_PATH=\"\\\"${PLUGIN_PATH}\\\"\"" ) add_test( TestTrack TestTrack ) endif( BUILD_MARBLE_TESTS ) set(KDE_SKIP_UNINSTALL_TARGET ON CACHE BOOL "KDE uninstall target must be disabled") find_package(ECM QUIET) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) if(ECM_FOUND) include(KDEInstallDirs) endif() macro_optional_find_package(KF5 QUIET COMPONENTS KIO) if(KF5_FOUND) - install(FILES marble_part_gpx.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +# install again once part is fixed to load and show the passed file +# install(FILES marble_part_gpx.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES marble_thumbnail_gpx.desktop DESTINATION ${SERVICES_INSTALL_DIR}) endif() diff --git a/src/plugins/runner/kml/CMakeLists.txt b/src/plugins/runner/kml/CMakeLists.txt index 573e1493b..13761fd5c 100644 --- a/src/plugins/runner/kml/CMakeLists.txt +++ b/src/plugins/runner/kml/CMakeLists.txt @@ -1,34 +1,36 @@ PROJECT( KmlPlugin ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src/lib/marble/geodata/handlers/kml ${QT_INCLUDE_DIR} ) set( kml_SRCS KmlDocument.cpp KmlParser.cpp KmlPlugin.cpp KmlRunner.cpp KmzHandler.cpp ) marble_add_plugin( KmlPlugin ${kml_SRCS} ) if(WIN32 OR APPLE) # nothing to do else() install(FILES marble_kml.desktop DESTINATION ${APPS_INSTALL_DIR}) install(FILES marble_kmz.desktop DESTINATION ${APPS_INSTALL_DIR}) endif() set(KDE_SKIP_UNINSTALL_TARGET ON CACHE BOOL "KDE uninstall target must be disabled") find_package(ECM QUIET) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) if(ECM_FOUND) include(KDEInstallDirs) endif() macro_optional_find_package(KF5 QUIET COMPONENTS KIO) if(KF5_FOUND) - install(FILES marble_part_kml.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +# install again once part is fixed to load and show the passed file +# install(FILES marble_part_kml.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES marble_thumbnail_kml.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(PROGRAMS marble_kmz.desktop DESTINATION ${APPS_INSTALL_DIR}) - install(FILES marble_part_kmz.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +# install again once part is fixed to load and show the passed file +# install(FILES marble_part_kmz.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES marble_thumbnail_kmz.desktop DESTINATION ${SERVICES_INSTALL_DIR}) endif() diff --git a/src/plugins/runner/osm/CMakeLists.txt b/src/plugins/runner/osm/CMakeLists.txt index 82091a57b..669904f9c 100644 --- a/src/plugins/runner/osm/CMakeLists.txt +++ b/src/plugins/runner/osm/CMakeLists.txt @@ -1,53 +1,54 @@ PROJECT( OsmPlugin ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/writers ${CMAKE_CURRENT_SOURCE_DIR}/translators ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDE_DIR} ) set( osm_writers_SRCS writers/OsmObjectAttributeWriter.cpp writers/OsmNodeTagWriter.cpp writers/OsmWayTagWriter.cpp writers/OsmRelationTagWriter.cpp writers/OsmTagWriter.cpp writers/OsmTagTagWriter.cpp ) set( osm_translators_SRCS translators/OsmDocumentTagTranslator.cpp translators/OsmPlacemarkTagTranslator.cpp translators/OsmFeatureTagTranslator.cpp ) set( osm_SRCS OsmParser.cpp OsmPlugin.cpp OsmRunner.cpp OsmNode.cpp OsmWay.cpp OsmRelation.cpp OsmElementDictionary.cpp ) marble_add_plugin( OsmPlugin ${osm_SRCS} ${osm_writers_SRCS} ${osm_translators_SRCS} ) if(WIN32 OR APPLE) # nothing to do else() install(FILES marble_osm.desktop DESTINATION ${APPS_INSTALL_DIR}) endif() set(KDE_SKIP_UNINSTALL_TARGET ON CACHE BOOL "KDE uninstall target must be disabled") find_package(ECM QUIET) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) if(ECM_FOUND) include(KDEInstallDirs) endif() macro_optional_find_package(KF5 QUIET COMPONENTS KIO) if(KF5_FOUND) - install(FILES marble_part_osm.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +# install again once part is fixed to load and show the passed file +# install(FILES marble_part_osm.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES marble_thumbnail_osm.desktop DESTINATION ${SERVICES_INSTALL_DIR}) endif() diff --git a/src/plugins/runner/shp/CMakeLists.txt b/src/plugins/runner/shp/CMakeLists.txt index cddaebf69..466a5ee23 100644 --- a/src/plugins/runner/shp/CMakeLists.txt +++ b/src/plugins/runner/shp/CMakeLists.txt @@ -1,32 +1,33 @@ PROJECT( ShpPlugin ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDE_DIR} ${LIBSHP_INCLUDE_DIR} ) set( shp_SRCS ShpPlugin.cpp ShpRunner.cpp ) set( ShpPlugin_LIBS ${LIBSHP_LIBRARIES} ) marble_add_plugin( ShpPlugin ${shp_SRCS} ) if(WIN32 OR APPLE) # nothing to do else() install(FILES marble_shp.desktop DESTINATION ${APPS_INSTALL_DIR}) endif() set(KDE_SKIP_UNINSTALL_TARGET ON CACHE BOOL "KDE uninstall target must be disabled") find_package(ECM QUIET) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) if(ECM_FOUND) include(KDEInstallDirs) endif() macro_optional_find_package(KF5 QUIET COMPONENTS KIO) if(KF5_FOUND) - install(FILES marble_part_shp.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +# install again once part is fixed to load and show the passed file +# install(FILES marble_part_shp.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES marble_thumbnail_shp.desktop DESTINATION ${SERVICES_INSTALL_DIR}) endif()