mirror/Hyprland
3
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2026-08-18 11:02:10 +00:00
Code Issues Projects Releases Wiki Activity

build: link Glaze to the compositor core (#15454)

Browse Source 
Co-authored-by: Pppp1116 <ACCOUNT1_NOREPLY>
This commit is contained in:
NotPppp1116
2026-07-17 10:42:56 +01:00
committed by GitHub
parent 5663e6d129
commit 229bca7b1a
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -130,6 +130,20 @@ set(GLES_VERSION "GLES3")
find_package(OpenGL REQUIRED COMPONENTS ${GLES_VERSION}) find_package(OpenGL REQUIRED COMPONENTS ${GLES_VERSION})
find_package(glslang CONFIG REQUIRED) find_package(glslang CONFIG REQUIRED)
find_package(glaze 7...<8 QUIET)
if(NOT glaze_FOUND)
set(GLAZE_VERSION v7.2.0)
message(STATUS "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()
set(AQUAMARINE_MINIMUM_VERSION 0.9.3) set(AQUAMARINE_MINIMUM_VERSION 0.9.3)
set(HYPRLANG_MINIMUM_VERSION 0.6.7) set(HYPRLANG_MINIMUM_VERSION 0.6.7)
set(HYPRCURSOR_MINIMUM_VERSION 0.1.7) set(HYPRCURSOR_MINIMUM_VERSION 0.1.7)
@ -294,6 +308,7 @@ target_link_libraries(Hyprland hyprland_lib)
target_include_directories(hyprland_lib PUBLIC ${deps_INCLUDE_DIRS} ${LUA_INCLUDE_DIRS}) target_include_directories(hyprland_lib PUBLIC ${deps_INCLUDE_DIRS} ${LUA_INCLUDE_DIRS})
target_include_directories(Hyprland PUBLIC ${deps_INCLUDE_DIRS} ${LUA_INCLUDE_DIRS}) target_include_directories(Hyprland PUBLIC ${deps_INCLUDE_DIRS} ${LUA_INCLUDE_DIRS})
target_link_libraries(hyprland_lib PRIVATE glaze::glaze)
set(USE_GPROF OFF) set(USE_GPROF OFF)

6
hyprpm/CMakeLists.txt
View File

@ -11,8 +11,10 @@ set(CMAKE_CXX_STANDARD 23)
pkg_check_modules(hyprpm_deps REQUIRED IMPORTED_TARGET tomlplusplus hyprutils>=0.7.0) pkg_check_modules(hyprpm_deps REQUIRED IMPORTED_TARGET tomlplusplus hyprutils>=0.7.0)
find_package(glaze 7...<8 QUIET) if (NOT TARGET glaze::glaze)
if (NOT glaze_FOUND) find_package(glaze 7...<8 QUIET)
endif()
if (NOT glaze_FOUND AND NOT TARGET glaze::glaze)
set(GLAZE_VERSION v7.2.0) set(GLAZE_VERSION v7.2.0)
message(STATUS "hyprpm: glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent") message(STATUS "hyprpm: glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent")
include(FetchContent) include(FetchContent)

6
start/CMakeLists.txt
View File

@ -11,8 +11,10 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules(starthyprland_deps REQUIRED IMPORTED_TARGET hyprutils>=0.10.3) pkg_check_modules(starthyprland_deps REQUIRED IMPORTED_TARGET hyprutils>=0.10.3)
find_package(glaze 7...<8 QUIET) if (NOT TARGET glaze::glaze)
if (NOT glaze_FOUND) find_package(glaze 7...<8 QUIET)
endif()
if (NOT glaze_FOUND AND NOT TARGET glaze::glaze)
set(GLAZE_VERSION v7.2.0) set(GLAZE_VERSION v7.2.0)
message(STATUS "start: glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent") message(STATUS "start: glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent")
include(FetchContent) include(FetchContent)