Commit 69253f88 authored by Ahmad Samir's avatar Ahmad Samir
Browse files

Use KF standard scheme for the include headers install location

- CamelCase fowarding headers in KF*/KSyntaxHighlighting/KSyntaxHighlighting
- Lowercase headers and _export.h in KF*/KSyntaxHighlighting/ksyntaxhighlighting
- _version.h KF*/KSyntaxHighlighting
- Remove <prefix>/include/KF*/ from the interface include dirs, now all
  headers are in KF*/KSyntaxHighlighting/

For backwards-compatibility, install all the headers in
KF*/KSyntaxHighlighting.

NO_CHANGELOG
parent 4014f250
Pipeline #124415 passed with stage
in 3 minutes and 55 seconds
......@@ -47,7 +47,7 @@ set_target_properties(KF5SyntaxHighlighting PROPERTIES
SOVERSION ${SyntaxHighlighting_SOVERSION}
EXPORT_NAME SyntaxHighlighting
)
target_include_directories(KF5SyntaxHighlighting INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KSyntaxHighlighting;${KDE_INSTALL_INCLUDEDIR_KF}>")
target_include_directories(KF5SyntaxHighlighting INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KSyntaxHighlighting>")
target_include_directories(KF5SyntaxHighlighting PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR};>")
target_link_libraries(KF5SyntaxHighlighting
PUBLIC
......@@ -56,26 +56,48 @@ target_link_libraries(KF5SyntaxHighlighting
Qt${QT_MAJOR_VERSION}::Network
)
ecm_generate_headers(SyntaxHighlighting_HEADERS
HEADER_NAMES
AbstractHighlighter
Definition
DefinitionDownloader
FoldingRegion
Format
Repository
State
SyntaxHighlighter
Theme
WildcardMatcher
set(Forwarding_Header_Names
AbstractHighlighter
Definition
DefinitionDownloader
FoldingRegion
Format
Repository
State
SyntaxHighlighter
Theme
WildcardMatcher
)
ecm_generate_headers(CamelCase_HEADERS
HEADER_NAMES ${Forwarding_Header_Names}
REQUIRED_HEADERS SyntaxHighlighting_HEADERS
PREFIX KSyntaxHighlighting
)
install(TARGETS KF5SyntaxHighlighting EXPORT KF5SyntaxHighlightingTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
${CamelCase_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KSyntaxHighlighting/KSyntaxHighlighting
)
install(FILES
${SyntaxHighlighting_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/ksyntaxhighlighting_export.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KSyntaxHighlighting)
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KSyntaxHighlighting/ksyntaxhighlighting
)
# TODO KF6: remove this, backward compatible headers location
ecm_generate_headers(Compat_CamelCase_HEADERS
HEADER_NAMES ${Forwarding_Header_Names}
REQUIRED_HEADERS Compat_SyntaxHighlighting_HEADERS
)
install(FILES
${Compat_CamelCase_HEADERS}
${Compat_SyntaxHighlighting_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/ksyntaxhighlighting_export.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KSyntaxHighlighting
)
if(BUILD_QCH)
ecm_add_qch(
......
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