Commit 7aa80f49 authored by Volker Krause's avatar Volker Krause
Browse files

Follow the standard KF include install layout

Needed to fix the KF6 build of consumers of this.
parent 54bb9816
Pipeline #185723 passed with stage
in 5 minutes and 19 seconds
......@@ -58,6 +58,8 @@ if (NOT WIN32)
set_package_properties(Protobuf PROPERTIES TYPE OPTIONAL PURPOSE "Parsing of OSM PBF files.")
endif()
set(KPUBLICTRANSPORT_INSTALL_INCLUDEDIR ${KDE_INSTALL_INCLUDEDIR}/KPublicTransport)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900)
add_subdirectory(src)
......@@ -82,7 +84,7 @@ install(FILES
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kpublictransport_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kpublictransport_version.h DESTINATION ${KPUBLICTRANSPORT_INSTALL_INCLUDEDIR} COMPONENT Devel)
install(EXPORT KPublicTransportTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPublicTransportTargets.cmake)
......
......@@ -132,6 +132,7 @@ set_target_properties(KPublicTransport PROPERTIES
EXPORT_NAME KPublicTransport
)
target_include_directories(KPublicTransport PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
target_include_directories(KPublicTransport INTERFACE "$<INSTALL_INTERFACE:${KPUBLICTRANSPORT_INSTALL_INCLUDEDIR}>")
target_link_libraries(KPublicTransport
PUBLIC
Qt::Gui
......@@ -222,14 +223,14 @@ install(FILES
${KPublicTransport_FORWARDING_HEADERS}
${KPublicTransport_Datatypes_FORWARDING_HEADERS}
${KPublicTransport_Models_FORWARDING_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPublicTransport
DESTINATION ${KPUBLICTRANSPORT_INSTALL_INCLUDEDIR}/KPublicTransport
)
install(FILES
${KPublicTransport_HEADERS}
${KPublicTransport_Datatypes_HEADERS}
${KPublicTransport_Models_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/kpublictransport_export.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kpublictransport
DESTINATION ${KPUBLICTRANSPORT_INSTALL_INCLUDEDIR}/kpublictransport
)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment