Link against host Glibmm using pkg-config

Author: dhilst

CMakeLists.txt

@@ -6,6 +6,10 @@ cmake_minimum_required(VERSION 3.26.5)
 # so that it works well with tools like CPM or other
 # manual dependency management
 
+# Load PkgConfig so we can use pkg_check_modules later
+# to find local packages.
+find_package(PkgConfig REQUIRED)
+
 # Only set the cxx_standard if it is not set by someone else
 if (NOT DEFINED CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 23)

Dependencies.cmake

@@ -86,14 +86,6 @@ function(cloysterhpc_setup_dependencies)
     endif()
   endif()
 
-  if(NOT TARGET glibmm::glibmm)
-    if (cloysterhpc_ENABLE_CONAN)
-      CPMFindPackage(NAME glibmm)
-    else()
-      CPMAddPackage("gh:GNOME/glibmm@2.78.1")
-    endif()
-  endif()
-
   if(NOT TARGET SDBusCpp::sdbus-c++)
     if (cloysterhpc_ENABLE_CONAN)
       CPMFindPackage(NAME sdbus-c++)
@@ -123,13 +115,29 @@ function(cloysterhpc_setup_dependencies)
   endif()
 
   # Standalone packages
+  include(FindPackageHandleStandardArgs)
+
   # Include module path for packages that we need to find or build
   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
   include(cmake/Findnewt.cmake)
   if(NOT TARGET newt)
     CPMFindPackage(NAME newt)
   endif()
 
+  if(NOT TARGET glibmm)
+    pkg_check_modules(GLIBMM REQUIRED glibmm-2.4)
+
+    message(STATUS "GLIBMM_LIBRARIES=${GLIBMM_LIBRARIES}")
+    message(STATUS "GLIBMM_INCLUDE_DIRS=${GLIBMM_INCLUDE_DIRS}")
+    find_package_handle_standard_args(glibmm
+      DEFAULT_MSG
+      GLIBMM_LIBRARIES
+      GLIBMM_INCLUDE_DIRS)
+
+    mark_as_advanced(GLIBMM_INCLUDE_DIRS GLIBMM_LIBRARIES)
+    # include_directories(${GLIBMM_INCLUDE_DIRS})
+  endif()
+
   # Set the variable ${STDC++FS} to the correct library
   include(cmake/Addstdcppfs.cmake)
 

buildrpm.sh

@@ -1,9 +1,25 @@
 #!/bin/bash -eu
 
+SUPPORTED_BUILD_DISTS=(rocky)
+ID=$(awk -F= '/^ID=/ { gsub("\"" , "", $2); print $2}' /etc/os-release)
+
+case "${SUPPORTED_BUILD_DISTS[*]}" in
+    "${ID}")
+        ;;
+    *)
+        echo "Build RPM Environment not supported, you need to run this" \
+          "in one of these distros: ${SUPPORTED_BUILD_DISTS}"
+        exit -1
+        ;;
+esac
+
+exit 0
+
+
 VERSION=$(awk '/Version:/ {print $2}' rpmspecs/opencattus.spec)
 cp rpmspecs/opencattus.spec ~/rpmbuild/SPECS/
 git archive -o ~/rpmbuild/SOURCES/opencattus-${VERSION}.tar.gz \
-	--format tgz HEAD --prefix opencattus-${VERSION}/ 
+	--format tgz HEAD --prefix opencattus-${VERSION}/
 rpmbuild -ba ~/rpmbuild/SPECS/opencattus.spec
 echo "RPM Generated"
 ls -l ~/rpmbuild/RPMS/*/opencattus-installer*.rpm

cmake/CommonLibraries.cmake

@@ -9,7 +9,7 @@ set(COMMON_LIBS
         Boost::thread
         spdlog::spdlog
         gsl::gsl-lite
-        glibmm::glibmm
+        ${GLIBMM_LIBRARIES}
         magic_enum::magic_enum
         SimpleIni::SimpleIni
         resolv

conanfile.py

@@ -1,13 +1,14 @@
 from conan import ConanFile
 from conan.tools.cmake import cmake_layout, CMakeToolchain, CMake
+from conan.tools.gnu import PkgConfigDeps
 
 class MyProjectConan(ConanFile):
     name = "CloysterHPC"
     version = "0.1.1"
-
     settings = "os", "arch", "compiler", "build_type"
 
     def requirements(self):
+        self.tool_requires("pkgconf/1.9.3")  # Ensure pkg-config is available
         self.requires("cli11/[>=2.4.0 <2.5.0]")
         self.requires("spdlog/[>=1.14.0 <1.15.0]")
         self.requires("fmt/[>=10.0.0 <12.0.0]")
@@ -16,7 +17,7 @@ def requirements(self):
         self.requires("gsl-lite/[>=0.41.0 <0.42.0]")
         self.requires("doctest/[>=2.4.0 <2.5.0]")
         self.requires("sdbus-cpp/[>=2.0.0 <2.1.0]")
-        self.requires("glibmm/[>=2.78.1 <2.79.0]")
+        # self.requires("glibmm/[>=2.78.1 <2.79.0]")
 
         # Override libmount to unify on 2.39.2.
         # This prevents the conflict with glib and sdbus-cpp requirements.
@@ -30,6 +31,8 @@ def layout(self):
     def generate(self):
         tc = CMakeToolchain(self)
         tc.generate()
+        pkg = PkgConfigDeps(self)
+        pkg.generate()
 
     def build(self):
         cmake = CMake(self)

include/cloysterhpc/functions.h

@@ -5,12 +5,10 @@
 #include <boost/process/child.hpp>
 #include <boost/process/pipe.hpp>
 #include <cloysterhpc/services/repos.h>
-#include <concepts>
 #include <filesystem>
-#include <glibmm/ustring.h>
+// #include <glibmm/ustring.h>
 #include <list>
 #include <optional>
-#include <ranges>
 #include <string>
 
 #include <boost/asio.hpp>

src/CMakeLists.txt

@@ -21,6 +21,10 @@ target_link_system_libraries(
 
 # Build a library and a ${cloysterhpc_BINARY_NAME} binary that links to the library
 add_library(cloysterhpc_object OBJECT ${SOURCE_FILES})
+
+# Include glibmm headers as SYSTEM header to avoid warnings
+target_include_directories(cloysterhpc_object SYSTEM PRIVATE ${GLIBMM_INCLUDE_DIRS})
+
 # add_library(cloysterhpc_static STATIC $<TARGET_OBJECTS:cloysterhpc_object>)
 add_library(cloysterhpc_static STATIC $<TARGET_OBJECTS:cloysterhpc_object> $<TARGET_OBJECTS:cloysterhpc_presenter_object>)
 add_executable(${cloysterhpc_BINARY_NAME} main.cpp)

src/diskImage.cpp

@@ -10,12 +10,13 @@
 #include <cloysterhpc/services/log.h>
 #include <cstddef>
 #include <fstream>
-#include <glibmm/checksum.h>
 #include <ios>
 #include <istream>
 #include <unordered_map>
 #include <vector>
 
+#include <glibmm.h>
+
 // @FIXME: This file need some work
 //
 // - The ISO can be probed for more information usign isoinfo command
@@ -108,7 +109,7 @@ bool DiskImage::hasVerifiedChecksum(const std::filesystem::path& path)
             "e" }
     };
 
-    Glib::Checksum checksum(Glib::Checksum::Type::SHA256);
+    Glib::Checksum checksum(Glib::Checksum::ChecksumType::CHECKSUM_SHA256);
 
     std::ifstream file(path, std::ios::in | std::ios::binary);
     if (!file.is_open()) {
@@ -122,14 +123,14 @@ bool DiskImage::hasVerifiedChecksum(const std::filesystem::path& path)
 
     while (file.read(reinterpret_cast<std::istream::char_type*>(buffer.data()),
         static_cast<std::streamsize>(buffer.size()))) {
-        std::streamsize bytesRead = file.gcount();
+        auto bytesRead = static_cast<gsize>(file.gcount());
 
         checksum.update(
             reinterpret_cast<const unsigned char*>(buffer.data()), bytesRead);
     }
 
     // Handle any leftover bytes after the while loop ends
-    std::streamsize bytesRead = file.gcount();
+    auto bytesRead = static_cast<gsize>(file.gcount());
     if (bytesRead > 0) {
         checksum.update(
             reinterpret_cast<const unsigned char*>(buffer.data()), bytesRead);

src/main.cpp

@@ -6,9 +6,6 @@
 #include <cctype>
 #include <cstdlib>
 
-#include <glibmm/fileutils.h>
-#include <glibmm/keyfile.h>
-
 #include <CLI/CLI.hpp>
 #include <cloysterhpc/cloyster.h>
 #include <cloysterhpc/const.h>

src/services/files.cpp

@@ -13,11 +13,11 @@ namespace cloyster::services::files {
 
 struct KeyFile::Impl {
     std::filesystem::path m_path;
-    Glib::RefPtr<Glib::KeyFile> m_keyfile;
+    std::unique_ptr<Glib::KeyFile> m_keyfile;
 
-    Impl(Glib::RefPtr<Glib::KeyFile>&& keyfile, std::filesystem::path path)
+    Impl(Glib::KeyFile&& keyfile, std::filesystem::path path)
         : m_path(std::move(path))
-        , m_keyfile(std::move(keyfile)) { };
+        , m_keyfile(std::make_unique<Glib::KeyFile>(std::move(keyfile))) { };
 
     void safeToFile(const std::filesystem::path& path)
     {
@@ -59,7 +59,7 @@ KeyFile::KeyFile(KeyFile::Impl&& impl)
 }
 
 KeyFile::KeyFile(const std::filesystem::path& path)
-    : m_impl(std::make_unique<KeyFile::Impl>(Glib::KeyFile::create(), path))
+    : m_impl(std::make_unique<KeyFile::Impl>(Glib::KeyFile(), path))
 {
     m_impl->m_path = path;
     m_impl->loadFromFile(path);
@@ -90,9 +90,8 @@ std::string KeyFile::getString(
 std::optional<std::string> KeyFile::getStringOpt(
     const std::string& group, const std::string& key) const
 {
-    auto keyFile = m_impl->m_keyfile;
-    if (keyFile->has_key(group, key)) {
-        return keyFile->get_string(group, key).raw();
+    if (m_impl->m_keyfile->has_key(group, key)) {
+        return m_impl->m_keyfile->get_string(group, key).raw();
     }
     return std::nullopt;
 }