diff --git a/.github/actions/setup_base/action.yml b/.github/actions/setup_base/action.yml index b4c9cf78f..7eab5649e 100644 --- a/.github/actions/setup_base/action.yml +++ b/.github/actions/setup_base/action.yml @@ -20,6 +20,7 @@ runs: clang \ cmake \ git \ + glaze \ glm \ glslang \ go \ @@ -64,15 +65,6 @@ runs: librsvg \ re2 - - name: Get glaze - shell: bash - run: | - git clone https://github.com/stephenberry/glaze.git - cd glaze - cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build - cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF` - cmake --install build - - name: Get hyprwayland-scanner-git shell: bash run: | diff --git a/hyprpm/CMakeLists.txt b/hyprpm/CMakeLists.txt index d744ac163..b3028d0ad 100644 --- a/hyprpm/CMakeLists.txt +++ b/hyprpm/CMakeLists.txt @@ -13,7 +13,7 @@ pkg_check_modules(hyprpm_deps REQUIRED IMPORTED_TARGET tomlplusplus hyprutils>=0 find_package(glaze QUIET) if (NOT glaze_FOUND) - set(GLAZE_VERSION v4.2.3) + set(GLAZE_VERSION v5.1.1) message(STATUS "glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent") include(FetchContent) FetchContent_Declare(