[Search] Move to libs

nemomobile-ux · Jul 16, 2024 · 78f771e · 78f771e
1 parent 4522d98
commit 78f771e
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,6 +40,7 @@ find_package(KF6BluezQt REQUIRED)
 add_definitions(-DBLUEZQT_VERSION_MAJOR=${KF6BluezQt_VERSION_MAJOR})
 add_definitions(-DBLUEZQT_VERSION_MINOR=${KF6BluezQt_VERSION_MINOR})
 
+add_subdirectory(lib)
 add_subdirectory(src)
 add_subdirectory(settings-plugins)
 

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(search)
diff --git a/lib/search/CMakeLists.txt b/lib/search/CMakeLists.txt
@@ -0,0 +1,24 @@
+set(PROJECT glacierhomesearch)
+
+set(SRC
+    searchpluginmanager.h
+    searchpluginmanager.cpp)
+
+set(PUBLIC_HEADERS
+    glaciersearchplugin.h)
+
+include_directories(${CMAKE_SOURCE_DIR}/src)
+
+add_library(${PROJECT} SHARED ${SRC} ${HEADERS} ${PUBLIC_HEADERS})
+add_library(GlacierHome::Search ALIAS ${PROJECT})
+
+target_link_libraries(${PROJECT}
+    Qt6::Core)
+
+set_target_properties(${PROJECT} PROPERTIES VERSION 0.1 SOVERSION 0)
+
+install(TARGETS ${PROJECT}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/)
+
+install(FILES ${PUBLIC_HEADERS}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glacier-home)
diff --git a/src/search/glaciersearchplugin.h → lib/search/glaciersearchplugin.h b/src/search/glaciersearchplugin.h → lib/search/glaciersearchplugin.h
@@ -20,8 +20,10 @@
 #ifndef GLACIERSEARCHPLUGIN_H
 #define GLACIERSEARCHPLUGIN_H
 
-#include "../glacier_global.h"
+#include <glacier_global.h>
 #include <QObject>
+#include <QMap>
+#include <QVariant>
 
 class GLACIER_EXPORT GlacierSearchPlugin : public QObject {
     Q_OBJECT

diff --git a/src/search/searchpluginmanager.cpp → lib/search/searchpluginmanager.cpp b/src/search/searchpluginmanager.cpp → lib/search/searchpluginmanager.cpp
diff --git a/src/search/searchpluginmanager.h → lib/search/searchpluginmanager.h b/src/search/searchpluginmanager.h → lib/search/searchpluginmanager.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -15,13 +15,7 @@ set(SRC
     models/controlcenterbuttonsmodel.h
     models/searchmodel.h
     models/searchmodel.cpp
-    search/searchpluginmanager.h
-    search/searchpluginmanager.cpp
-    ${QML_JS_FILES}
-    )
-
-set(PUBLIC_HEADERS
-    search/glaciersearchplugin.h)
+    ${QML_JS_FILES})
 
 #add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/geoagent.h ${CMAKE_CURRENT_SOURCE_DIR}/geoagent.cpp
 #    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.GeoClue2.Agent.xml
@@ -45,11 +39,14 @@ endif()
 
 add_executable(lipstick ${SRC} ${GEOCLUE_SRC} ${PUBLIC_HEADERS})
 
+include_directories(${CMAKE_SOURCE_DIR}/lib)
+
 target_link_libraries(lipstick PUBLIC
     Qt6::Gui
     Qt6::Qml
     Qt6::Quick
     Qt6::DBus
+    GlacierHome::Search
     PkgConfig::LIPSTICK
     PkgConfig::MLITE6
     PkgConfig::NEMODEVICELOCK
@@ -62,5 +59,3 @@ install(TARGETS lipstick RUNTIME
     DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(DIRECTORY qml
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glacier-home)
-install(FILES ${PUBLIC_HEADERS}
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glacier-home)
diff --git a/src/models/searchmodel.h b/src/models/searchmodel.h
@@ -23,7 +23,7 @@
 #include <QAbstractListModel>
 #include <QObject>
 
-#include "search/searchpluginmanager.h"
+#include <search/searchpluginmanager.h>
 
 class SearchModel : public QAbstractListModel {
     Q_OBJECT