tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[smsapp] Random cmake cleanup

Browse source 
Turn smshelper into a static library, which makes sense given it's only used internally at this point. This allows to get rid of some stuff.
Also cleanup other things.
This commit is contained in:
Nicolas Fella 2020-07-30 08:28:15 +00:00
parent c0b35debe1
commit e2e303d7cc
2 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
smsapp/CMakeLists.txt
View file

@ -1,7 +1,3 @@
qt5_add_resources(KCSMS_SRCS resources.qrc)
find_package(KF5People)
set(smshelper_debug_file_SRCS) set(smshelper_debug_file_SRCS)
ecm_qt_declare_logging_category( ecm_qt_declare_logging_category(
smshelper_debug_file_SRCS HEADER smshelper_debug.h smshelper_debug_file_SRCS HEADER smshelper_debug.h
@ -22,22 +18,16 @@ ecm_qt_declare_logging_category(
DEFAULT_SEVERITY Warning DEFAULT_SEVERITY Warning
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (sms conversations list)") EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (sms conversations list)")
add_library(kdeconnectsmshelper add_library(kdeconnectsmshelper STATIC
smshelper.cpp smshelper.cpp
gsmasciimap.cpp gsmasciimap.cpp
${smshelper_debug_file_SRCS} ${smshelper_debug_file_SRCS}
) )
set_target_properties(kdeconnectsmshelper PROPERTIES
VERSION ${KDECONNECT_VERSION}
SOVERSION ${KDECONNECT_VERSION_MAJOR}
)
generate_export_header(kdeconnectsmshelper EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kdeconnectsms_export.h BASE_NAME KDEConnectSmsAppLib)
target_include_directories(kdeconnectsmshelper PUBLIC ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(kdeconnectsmshelper PUBLIC ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(kdeconnectsmshelper target_link_libraries(kdeconnectsmshelper
PUBLIC PUBLIC
Qt5::Core Qt5::Core
Qt5::DBus Qt5::DBus
KF5::People KF5::People
@ -45,18 +35,12 @@ PUBLIC
kdeconnectinterfaces kdeconnectinterfaces
) )
# If ever this library is actually used by someone else, we should export these headers
set(libkdeconnectsmshelper_HEADERS
smshelper.h
${CMAKE_CURRENT_BINARY_DIR}/kdeconnectsms_export.h
)
add_executable(kdeconnect-sms add_executable(kdeconnect-sms
main.cpp main.cpp
conversationlistmodel.cpp conversationlistmodel.cpp
conversationmodel.cpp conversationmodel.cpp
conversationssortfilterproxymodel.cpp conversationssortfilterproxymodel.cpp
${KCSMS_SRCS} resources.qrc
${sms_debug_files_SRCS}) ${sms_debug_files_SRCS})
target_include_directories(kdeconnect-sms PUBLIC ${CMAKE_BINARY_DIR}) target_include_directories(kdeconnect-sms PUBLIC ${CMAKE_BINARY_DIR})
@ -73,5 +57,4 @@ target_link_libraries(kdeconnect-sms
) )
install(TARGETS kdeconnect-sms ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kdeconnect-sms ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kdeconnectsmshelper ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
install(PROGRAMS org.kde.kdeconnect.sms.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(PROGRAMS org.kde.kdeconnect.sms.desktop DESTINATION ${KDE_INSTALL_APPDIR})

3
smsapp/smshelper.h
View file

@ -30,12 +30,11 @@
#include "interfaces/conversationmessage.h" #include "interfaces/conversationmessage.h"
#include "kdeconnectsms_export.h"
#include "smsapp/smscharcount.h" #include "smsapp/smscharcount.h"
class PersonsCache; class PersonsCache;
class KDECONNECTSMSAPPLIB_EXPORT SmsHelper : public QObject class SmsHelper : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public: