Fix installers

Author: awawa-dev

cmake/installer_linux.cmake

@@ -30,11 +30,12 @@ macro(InstallerLinux TARGET)
         endif()
 
         # Optymalizacja: Pętla dla naszych wewnętrznych bibliotek
-        set(CUSTOM_INTERNAL_LIBS smart-x11 smart-pipewire utils-image utils-zstd)
+        set(INTERNAL_LIBS_PATHS "")
+        set(CUSTOM_INTERNAL_LIBS smart-x11 smart-pipewire utils-image utils-zstd systray-widget )
         foreach(custom_lib ${CUSTOM_INTERNAL_LIBS})
             if (TARGET ${custom_lib})
-                # Instalacja do np. /usr/lib/hyperhdr/
-                install(CODE "file(INSTALL FILES $<TARGET_FILE:${custom_lib}> DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/hyperhdr\" TYPE SHARED_LIBRARY)" COMPONENT "HyperHDR")
+                install(TARGETS ${custom_lib} DESTINATION "${CMAKE_INSTALL_LIBDIR}/hyperhdr" COMPONENT "HyperHDR")
+                list(APPEND INTERNAL_LIBS_PATHS "$<TARGET_FILE_DIR:${custom_lib}>")
             endif()
         endforeach()
 
@@ -101,6 +102,10 @@ macro(InstallerLinux TARGET)
             install(CODE "set(TARGET_FILE \"${TARGET_FILE}\")" COMPONENT "HyperHDR")
             install(CODE "set(PREREQUISITE_LIBS \"${PREREQUISITE_LIBS}\")" COMPONENT "HyperHDR")
             install(CODE "set(QT_PLUGINS_DIR \"${QT_PLUGINS_DIR}\")" COMPONENT "HyperHDR")
+            install(CODE "set(INTERNAL_LIBS_PATHS \"${INTERNAL_LIBS_PATHS}\")" COMPONENT "HyperHDR")
+            install(CODE "set(DEST_DIR \"${CMAKE_INSTALL_LIBDIR}/hyperhdr/external\")" COMPONENT "HyperHDR")
+
+            message( "INTERNAL_LIBS_PATHS: ${INTERNAL_LIBS_PATHS}" )
 
             install(CODE [[
                 set(SYSTEM_LIBS_SKIP
@@ -119,9 +124,8 @@ macro(InstallerLinux TARGET)
 
                 include(GetPrerequisites)        
                 if (NOT CMAKE_CROSSCOMPILING)
-                    file(GET_RUNTIME_DEPENDENCIES RESOLVED_DEPENDENCIES_VAR DEPENDENCIES DIRECTORIES ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/hyperhdr EXECUTABLES ${TARGET_FILE})
+                    file(GET_RUNTIME_DEPENDENCIES RESOLVED_DEPENDENCIES_VAR DEPENDENCIES DIRECTORIES ${INTERNAL_LIBS_PATHS} EXECUTABLES ${TARGET_FILE})
 
-                    file(INSTALL FILES $<TARGET_FILE:systray-widget> DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/hyperhdr" TYPE SHARED_LIBRARY)
                     file(GET_RUNTIME_DEPENDENCIES RESOLVED_DEPENDENCIES_VAR SYS_DEPENDENCIES EXECUTABLES $<TARGET_FILE:systray-widget>)
                     foreach(systrayLib ${SYS_DEPENDENCIES})
                         string(FIND ${systrayLib} "libayatana" _sysindex)
@@ -139,7 +143,8 @@ macro(InstallerLinux TARGET)
                         foreach(file ${files})
                             file(GET_RUNTIME_DEPENDENCIES RESOLVED_DEPENDENCIES_VAR QT_DEPENDENCIES EXECUTABLES ${file})
                             list(APPEND DEPENDENCIES ${QT_DEPENDENCIES})
-                            file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/hyperhdr/external/plugins/${PLUGIN}" TYPE SHARED_LIBRARY FILES ${file})
+                            file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/${DEST_DIR}/plugins/${PLUGIN}" TYPE SHARED_LIBRARY FILES ${file})
+                            message("Installing QT plugin: ${file} to ${CMAKE_INSTALL_PREFIX}/${DEST_DIR}/plugins/${PLUGIN}")
                         endforeach()
                     endif()
                 endforeach()
@@ -168,15 +173,14 @@ macro(InstallerLinux TARGET)
                 endforeach()        
 
                 # Kopiowanie i ew. patchowanie RPATH z zachowaniem nowych ścieżek FHS
-                set(DEST_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/hyperhdr/external")
                 foreach(PREREQUISITE_LIB IN LISTS PREREQUISITE_LIBS)
                     # 1. Instalacja pliku bezpośrednio do katalogu docelowego
-                    file(INSTALL FILES "${PREREQUISITE_LIB}" DESTINATION "${DEST_DIR}" TYPE SHARED_LIBRARY)
-
+                    file(INSTALL FILES "${PREREQUISITE_LIB}" DESTINATION "${CMAKE_INSTALL_PREFIX}/${DEST_DIR}" TYPE SHARED_LIBRARY)
+                    message("Installing: ${PREREQUISITE_LIB} to ${CMAKE_INSTALL_PREFIX}/${DEST_DIR}")
                     # 2. Sprawdzenie, czy plik nie jest dowiązaniem i czy to libproxy / libpxbackend
                     if(NOT IS_SYMLINK "${PREREQUISITE_LIB}" AND "${PREREQUISITE_LIB}" MATCHES "libproxy|libpxbackend")
                         get_filename_component(FILENAME "${PREREQUISITE_LIB}" NAME)
-                        set(INSTALLED_FILE "${DEST_DIR}/${FILENAME}")
+                        set(INSTALLED_FILE "${CMAKE_INSTALL_PREFIX}/${DEST_DIR}/${FILENAME}")
                         message("Patching RPATH: ${INSTALLED_FILE}")
                         execute_process(COMMAND chrpath -d "${INSTALLED_FILE}" OUTPUT_VARIABLE outputResult)
                     endif()

cmake/linux/arch/PKGBUILD

@@ -26,5 +26,4 @@ package() {
     rm -rf $pkgdir/usr/bin/flatc
     rm -rf $pkgdir/usr/cmake
     rm -rf $pkgdir/usr/include
-    rm -rf $pkgdir/usr/lib
 }