From 30c498acf4173930dfd8afd6279ebceacb1941e9 Mon Sep 17 00:00:00 2001 From: davc0n Date: Sun, 15 Mar 2026 23:53:28 +0100 Subject: build: add glaze dependency with FetchContent fallback (#13666) --- hyprpm/CMakeLists.txt | 6 +++--- start/CMakeLists.txt | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/hyprpm/CMakeLists.txt b/hyprpm/CMakeLists.txt index 9f1318f4..aefb71bb 100644 --- a/hyprpm/CMakeLists.txt +++ b/hyprpm/CMakeLists.txt @@ -11,10 +11,10 @@ set(CMAKE_CXX_STANDARD 23) pkg_check_modules(hyprpm_deps REQUIRED IMPORTED_TARGET tomlplusplus hyprutils>=0.7.0) -find_package(glaze 7.0.0 QUIET) +find_package(glaze 7...<8 QUIET) if (NOT glaze_FOUND) - set(GLAZE_VERSION v7.0.0) - message(STATUS "glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent") + set(GLAZE_VERSION v7.2.0) + message(STATUS "hyprpm: glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent") include(FetchContent) FetchContent_Declare( glaze diff --git a/start/CMakeLists.txt b/start/CMakeLists.txt index 00b1fded..d0c40ceb 100644 --- a/start/CMakeLists.txt +++ b/start/CMakeLists.txt @@ -11,11 +11,27 @@ find_package(PkgConfig REQUIRED) pkg_check_modules(starthyprland_deps REQUIRED IMPORTED_TARGET hyprutils>=0.10.3) +find_package(glaze 7...<8 QUIET) +if (NOT glaze_FOUND) + set(GLAZE_VERSION v7.2.0) + message(STATUS "start: glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent") + include(FetchContent) + FetchContent_Declare( + glaze + GIT_REPOSITORY https://github.com/stephenberry/glaze.git + GIT_TAG ${GLAZE_VERSION} + GIT_SHALLOW TRUE + EXCLUDE_FROM_ALL + ) + FetchContent_MakeAvailable(glaze) +endif() + file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp") add_executable(start-hyprland ${SRCFILES}) target_link_libraries(start-hyprland PUBLIC PkgConfig::starthyprland_deps) +target_link_libraries(start-hyprland PUBLIC glaze::glaze) install(TARGETS start-hyprland) -- cgit v1.2.3