Update build for SFOS

piggz · Dec 28, 2024 · a1b2b02 · a1b2b02
1 parent c23a306
commit a1b2b02
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set(SOURCES
 ./src/activitycoordinate.cpp
 ./src/activitykind.cpp

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -10,14 +10,12 @@ find_package(Qt5 REQUIRED COMPONENTS Core DBus Xml)
 if(FLAVOR STREQUAL "silica")
 
     pkg_check_modules(MLITE5 REQUIRED mlite5)
-    include_directories(${MLITE5_INCLUDE_DIRS})
-    link_libraries(${MLITE5_LIBRARIES})
 
 endif()
 
 
-target_include_directories(libamazfish PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
-target_link_libraries(libamazfish PUBLIC Qt5::Core Qt5::DBus Qt5::Xml)
+target_include_directories(libamazfish PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src ${MLITE5_INCLUDE_DIRS})
+target_link_libraries(libamazfish PUBLIC Qt5::Core Qt5::DBus Qt5::Xml ${MLITE5_LIBRARIES})
 
 set(SOURCES
     ./src/amazfish.cpp

diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
@@ -73,8 +73,17 @@ target_link_libraries(harbour-amazfish-ui
   Qt5::Core Qt5::Widgets Qt5::Quick Qt5::Positioning
   KDb
   o2
+  ${SAILFISH_LDFLAGS}
 )
 
+if(FLAVOR STREQUAL "silica")
+    target_include_directories(harbour-amazfish-ui PRIVATE
+        $<BUILD_INTERFACE:
+        ${SAILFISH_INCLUDE_DIRS}
+        >)
+endif()
+
+
 #install(FILES "harbour-amazfish.desktop"
 #    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")