From e2e303d7ccc236fa5020f3717f6c114ca70b53a4 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Thu, 30 Jul 2020 08:28:15 +0000
Subject: [PATCH] [smsapp] Random cmake cleanup

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.
---
 smsapp/CMakeLists.txt | 29 ++++++-----------------------
 smsapp/smshelper.h    |  3 +--
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/smsapp/CMakeLists.txt b/smsapp/CMakeLists.txt
index c1c764e16..07dd6beef 100644
--- a/smsapp/CMakeLists.txt
+++ b/smsapp/CMakeLists.txt
@@ -1,7 +1,3 @@
-qt5_add_resources(KCSMS_SRCS resources.qrc)
-
-find_package(KF5People)
-
 set(smshelper_debug_file_SRCS)
 ecm_qt_declare_logging_category(
     smshelper_debug_file_SRCS HEADER smshelper_debug.h
@@ -22,22 +18,16 @@ ecm_qt_declare_logging_category(
     DEFAULT_SEVERITY Warning
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (sms conversations list)")
 
-add_library(kdeconnectsmshelper
-	smshelper.cpp
-	gsmasciimap.cpp
-        ${smshelper_debug_file_SRCS}
+add_library(kdeconnectsmshelper STATIC
+    smshelper.cpp
+    gsmasciimap.cpp
+    ${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_link_libraries(kdeconnectsmshelper
-PUBLIC
+    PUBLIC
     Qt5::Core
     Qt5::DBus
     KF5::People
@@ -45,18 +35,12 @@ PUBLIC
     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
     main.cpp
     conversationlistmodel.cpp
     conversationmodel.cpp
     conversationssortfilterproxymodel.cpp
-    ${KCSMS_SRCS}
+    resources.qrc
     ${sms_debug_files_SRCS})
 
 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 kdeconnectsmshelper ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
 install(PROGRAMS org.kde.kdeconnect.sms.desktop DESTINATION ${KDE_INSTALL_APPDIR})
diff --git a/smsapp/smshelper.h b/smsapp/smshelper.h
index 47e089324..1add6e996 100644
--- a/smsapp/smshelper.h
+++ b/smsapp/smshelper.h
@@ -30,12 +30,11 @@
 
 #include "interfaces/conversationmessage.h"
 
-#include "kdeconnectsms_export.h"
 #include "smsapp/smscharcount.h"
 
 class PersonsCache;
 
-class KDECONNECTSMSAPPLIB_EXPORT SmsHelper : public QObject
+class SmsHelper : public QObject
 {
     Q_OBJECT
 public: