mirror of
https://github.com/hyprwm/Hyprland.git
synced 2025-05-12 23:00:36 +01:00
ci: minor fixes to glaze
This commit is contained in:
parent
2ee5118d7a
commit
b8a204c21d
2 changed files with 2 additions and 10 deletions
10
.github/actions/setup_base/action.yml
vendored
10
.github/actions/setup_base/action.yml
vendored
|
@ -20,6 +20,7 @@ runs:
|
||||||
clang \
|
clang \
|
||||||
cmake \
|
cmake \
|
||||||
git \
|
git \
|
||||||
|
glaze \
|
||||||
glm \
|
glm \
|
||||||
glslang \
|
glslang \
|
||||||
go \
|
go \
|
||||||
|
@ -64,15 +65,6 @@ runs:
|
||||||
librsvg \
|
librsvg \
|
||||||
re2
|
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
|
- name: Get hyprwayland-scanner-git
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -13,7 +13,7 @@ pkg_check_modules(hyprpm_deps REQUIRED IMPORTED_TARGET tomlplusplus hyprutils>=0
|
||||||
|
|
||||||
find_package(glaze QUIET)
|
find_package(glaze QUIET)
|
||||||
if (NOT glaze_FOUND)
|
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")
|
message(STATUS "glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent")
|
||||||
include(FetchContent)
|
include(FetchContent)
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
|
|
Loading…
Reference in a new issue