From 3747dee8a768539c84e65010219e8fa7db45a00d Mon Sep 17 00:00:00 2001 From: Hayodea Hekol Date: Thu, 20 Nov 2025 22:18:05 -0400 Subject: [PATCH] CPack: Target ubuntu; deb now works in gdebi --- cmake/CPackConfig.cmake | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/cmake/CPackConfig.cmake b/cmake/CPackConfig.cmake index eeb17a0..3e25f53 100644 --- a/cmake/CPackConfig.cmake +++ b/cmake/CPackConfig.cmake @@ -24,14 +24,21 @@ set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") # Enable deb and rpm generators set(CPACK_GENERATOR "DEB;RPM") -# DEB package specific settings +# DEB package specific settings (Ubuntu) set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Salmanoff Project ") set(CPACK_DEBIAN_PACKAGE_SECTION "science") set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") +# Target Ubuntu distribution +set(CPACK_DEBIAN_PACKAGE_DISTRIBUTION "ubuntu") +# Build dependencies (from builddeps file) +# These are needed to build the package from source +set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS + "build-essential, cmake (>= 3.16), libboost-all-dev, flex, bison, ocl-icd-opencl-dev, liburing-dev") + +# Runtime dependencies (from builddeps file - runtime equivalents) set(CPACK_DEBIAN_PACKAGE_DEPENDS - "libboost-system1.74.0 | libboost-system1.73.0 | libboost-system1.72.0, " - "libc6, libstdc++6") + "libboost-system1.74.0 | libboost-system1.73.0 | libboost-system1.72.0, libboost-log1.74.0 | libboost-log1.73.0 | libboost-log1.72.0, libc6, libstdc++6, ocl-icd-libopencl1 | libopencl1, liburing2 | liburing1") set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libxcb1, libx11-6") set(CPACK_DEBIAN_PACKAGE_SUGGESTS "livox-sdk") @@ -39,13 +46,17 @@ set(CPACK_DEBIAN_PACKAGE_SUGGESTS "livox-sdk") set(CPACK_RPM_PACKAGE_LICENSE "Proprietary") set(CPACK_RPM_PACKAGE_GROUP "Applications/Engineering") set(CPACK_RPM_PACKAGE_URL "https://github.com/salmanoff/salmanoff") -set(CPACK_RPM_PACKAGE_REQUIRES "boost-system >= 1.72.0, glibc, libstdc++") +set(CPACK_RPM_PACKAGE_REQUIRES "boost-system >= 1.72.0, boost-log >= 1.72.0, glibc, libstdc++, ocl-icd, liburing") set(CPACK_RPM_PACKAGE_SUGGESTS "xcb, libX11, livox-sdk") # Package file naming using project variables set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_PROCESSOR}") +# Enable automatic dependency detection for Debian packages +# This uses dpkg-shlibdeps to automatically detect shared library dependencies +set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) + # Set compression set(CPACK_DEB_COMPONENT_INSTALL ON) set(CPACK_RPM_COMPONENT_INSTALL ON)