Commit 7a13a678 authored by Arjen Hiemstra's avatar Arjen Hiemstra

Fix Formatter library CMake

Summary:
On older versions, install(TARGETS target PUBLIC_HEADER) does not seem
to work too well, so just use install(FILES) for now. In addition, the
Qml and Quick components were missing from the main CMake file.

Test Plan: Still builds and installs

Reviewers: #plasma, romangg

Reviewed By: #plasma, romangg

Subscribers: romangg, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D28217
parent 599270f0
......@@ -27,7 +27,7 @@ include(CheckLibraryExists)
include(FeatureSummary)
include(GenerateExportHeader)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS DBus Network Widgets)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS DBus Network Widgets Qml Quick)
find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} CONFIG)
set_package_properties(Qt5WebEngineWidgets PROPERTIES
URL "git://code.qt.org/qt/qtwebenginewidgets.git"
......
......@@ -27,10 +27,13 @@ set_target_properties(Formatter PROPERTIES
LIBRARY_OUTPUT_NAME KSysGuardFormatter
VERSION ${KSYSGUARD_VERSION_STRING}
SOVERSION ${Formatter_SOVERSION}
PUBLIC_HEADER "${formatter_HDRS};${CMAKE_CURRENT_BINARY_DIR}/formatter_export.h"
)
add_subdirectory(declarative)
install(TARGETS Formatter EXPORT libksysguardLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS Formatter PUBLIC_HEADER DESTINATION ${KDE_INSTALL_INCLUDEDIR}/ksysguard/formatter)
install(FILES
${formatter_HDRS}
${CMAKE_CURRENT_BINARY_DIR}/formatter_export.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/ksysguard/formatter
)
Markdown is supported
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