Castopod
/
kasts
mirror of https://github.com/KDE/kasts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also rename solidextras library

This commit is contained in:
Tobias Fella 2021-11-03 20:56:26 +01:00
parent 6d3951dcd6
commit 53249607db
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -145,7 +145,7 @@ add_executable(kasts ${SRCS})
kconfig_add_kcfg_files(kasts settingsmanager.kcfgc GENERATE_MOC)
target_include_directories(kasts PRIVATE ${CMAKE_BINARY_DIR})
target_link_libraries(kasts PRIVATE Qt::Core Qt::Qml Qt::Quick Qt::QuickControls2 Qt::Sql Qt::Multimedia KF5::Syndication KF5::CoreAddons KF5::ConfigGui KF5::I18n Taglib::Taglib SolidExtras ${QTKEYCHAIN_LIBRARIES})
target_link_libraries(kasts PRIVATE Qt::Core Qt::Qml Qt::Quick Qt::QuickControls2 Qt::Sql Qt::Multimedia KF5::Syndication KF5::CoreAddons KF5::ConfigGui KF5::I18n Taglib::Taglib KastsSolidExtras ${QTKEYCHAIN_LIBRARIES})
if(ANDROID)
target_link_libraries(kasts PRIVATE

16
src/solidextras/CMakeLists.txt
View File

@ -19,22 +19,24 @@ else()
qt_add_dbus_interface(solidextras_srcs org.freedesktop.portal.NetworkMonitor.xml portalnetworkmonitor)
endif()
add_library(SolidExtras ${solidextras_srcs})
generate_export_header(SolidExtras BASE_NAME SolidExtras)
add_library(KastsSolidExtras ${solidextras_srcs})
generate_export_header(KastsSolidExtras BASE_NAME KastsSolidExtras)
if (TARGET KF5::NetworkManagerQt)
set(HAVE_NM ON)
endif()
configure_file(config-solid-extras.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-solid-extras.h)
target_include_directories(SolidExtras PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>")
target_link_libraries(SolidExtras PUBLIC Qt::Core)
target_include_directories(KastsSolidExtras PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>")
target_link_libraries(KastsSolidExtras PUBLIC Qt::Core)
if (ANDROID)
target_link_libraries(SolidExtras PRIVATE Qt::AndroidExtras)
target_link_libraries(KastsSolidExtras PRIVATE Qt::AndroidExtras)
else ()
target_link_libraries(SolidExtras PRIVATE Qt::DBus)
target_link_libraries(KastsSolidExtras PRIVATE Qt::DBus)
if (TARGET KF5::NetworkManagerQt)
target_link_libraries(SolidExtras PRIVATE KF5::NetworkManagerQt)
target_link_libraries(KastsSolidExtras PRIVATE KF5::NetworkManagerQt)
endif()
endif()
install(TARGETS KastsSolidExtras ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})

4
src/solidextras/networkstatus.h
View File

@ -7,14 +7,14 @@
#ifndef SOLIDEXTRAS_NETWORKSTATUS_H
#define SOLIDEXTRAS_NETWORKSTATUS_H
#include "solidextras_export.h"
#include "kastssolidextras_export.h"
#include <QObject>
namespace SolidExtras {
/** Basic information about the network status (connectivity, metering). */
class SOLIDEXTRAS_EXPORT NetworkStatus : public QObject
class KASTSSOLIDEXTRAS_EXPORT NetworkStatus : public QObject
{
Q_OBJECT
Q_PROPERTY(State connectivity READ connectivity NOTIFY connectivityChanged)

2
src/solidextras/qml/CMakeLists.txt
View File

@ -4,7 +4,7 @@
add_library(kasts-solidextrasqmlplugin solidextrasqmlplugin.cpp)
target_link_libraries(kasts-solidextrasqmlplugin
Qt::Qml
SolidExtras
KastsSolidExtras
)
# make examples work without installation