diff --git a/CMakeLists.txt b/CMakeLists.txt index e62c9c8..fb6a00a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,49 +1,49 @@ cmake_minimum_required(VERSION 3.5) project(KPublicTransport VERSION 0.0.1) -find_package(ECM 5.38 REQUIRED NO_MODULE) +find_package(ECM 5.59 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMAddTests) include(ECMGenerateHeaders) include(ECMQtDeclareLoggingCategory) include(ECMSetupVersion) include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(GenerateExportHeader) set(CMAKE_CXX_STANDARD 14) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) ecm_setup_version(PROJECT VARIABLE_PREFIX KPUBLICTRANSPORT VERSION_HEADER kpublictransport_version.h PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPublicTransportConfigVersion.cmake" ) find_package(Qt5 5.10 REQUIRED COMPONENTS Test Quick Widgets) find_package(ZLIB REQUIRED) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) add_subdirectory(autotests) add_subdirectory(tests) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KPublicTransport") configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KPublicTransportConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KPublicTransportConfig.cmake" INSTALL_DESTINATION "${CMAKECONFIG_INSTALL_DIR}" ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KPublicTransportConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KPublicTransportConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) install(EXPORT KPublicTransportTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPublicTransportTargets.cmake) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9e5db5d..1b1e6ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,122 +1,122 @@ add_subdirectory(qmlplugin) set(kpublictransport_srcs departurereply.cpp departurerequest.cpp journeyreply.cpp journeyrequest.cpp locationreply.cpp locationrequest.cpp manager.cpp reply.cpp requestcontext.cpp backends/abstractbackend.cpp backends/cache.cpp backends/efabackend.cpp backends/efaparser.cpp backends/hafasbackend.cpp backends/hafasparser.cpp backends/hafasmgatebackend.cpp backends/hafasmgateparser.cpp backends/hafasquerybackend.cpp backends/hafasqueryparser.cpp backends/navitiabackend.cpp backends/navitiaparser.cpp datatypes/attribution.cpp datatypes/attributionutil.cpp datatypes/departure.cpp datatypes/departureutil.cpp datatypes/journey.cpp datatypes/json.cpp datatypes/line.cpp datatypes/location.cpp datatypes/mergeutil.cpp datatypes/platformutils.cpp models/abstractquerymodel.cpp models/departurequerymodel.cpp models/journeyquerymodel.cpp networks/networks.qrc ) ecm_qt_declare_logging_category(kpublictransport_srcs HEADER logging.h IDENTIFIER KPublicTransport::Log CATEGORY_NAME org.kde.kpublictransport) add_library(KPublicTransport ${kpublictransport_srcs}) generate_export_header(KPublicTransport BASE_NAME KPublicTransport) set_target_properties(KPublicTransport PROPERTIES VERSION ${KPUBLICTRANSPORT_VERSION_STRING} SOVERSION ${KPUBLICTRANSPORT_SOVERSION} EXPORT_NAME KPublicTransport ) target_include_directories(KPublicTransport PUBLIC "$") target_link_libraries(KPublicTransport PUBLIC Qt5::Gui PRIVATE Qt5::Network ZLIB::ZLIB ) ecm_generate_headers(KPublicTransport_FORWARDING_HEADERS HEADER_NAMES DepartureReply DepartureRequest JourneyReply JourneyRequest LocationReply LocationRequest Manager Reply PREFIX KPublicTransport REQUIRED_HEADERS KPublicTransport_HEADERS ) # # ### for testing only ecm_generate_headers(KPublicTransport_Backends_FORWARDING_HEADERS HEADER_NAMES Cache HafasMgateParser NavitiaParser PREFIX KPublicTransport REQUIRED_HEADERS KPublicTransport_Backends_HEADERS RELATIVE backends ) ecm_generate_headers(KPublicTransport_Datatypes_FORWARDING_HEADERS HEADER_NAMES Attribution Datatypes Departure Journey Line Location PREFIX KPublicTransport REQUIRED_HEADERS KPublicTransport_Datatypes_HEADERS RELATIVE datatypes ) ecm_generate_headers(KPublicTransport_Models_FORWARDING_HEADERS HEADER_NAMES AbstractQueryModel DepartureQueryModel JourneyQueryModel PREFIX KPublicTransport REQUIRED_HEADERS KPublicTransport_Models_HEADERS RELATIVE models ) install(TARGETS KPublicTransport EXPORT KPublicTransportTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES org_kde_kpublictransport.categories DESTINATION ${KDE_INSTALL_CONFDIR}) +install(FILES org_kde_kpublictransport.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) install(FILES ${KPublicTransport_FORWARDING_HEADERS} ${KPublicTransport_Datatypes_FORWARDING_HEADERS} ${KPublicTransport_Models_FORWARDING_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPublicTransport ) install(FILES ${KPublicTransport_HEADERS} ${KPublicTransport_Datatypes_HEADERS} ${KPublicTransport_Models_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/kpublictransport_export.h internal_impl.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kpublictransport )