Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-21 21:17:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] wayland: use wayland-protocols from submodule

Browse Source
This commit is contained in:
Tudor Brindus 2022-02-07 23:52:21 -05:00 committed by Geoffrey McRae
parent 770a4279ee
commit e1ac838796
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/displayservers/Wayland/CMakeLists.txt
View File

@ -51,8 +51,6 @@ target_include_directories(displayserver_Wayland
) )
find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner)
pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15)
pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir)
macro(wayland_generate protocol_file output_file) macro(wayland_generate protocol_file output_file)
add_custom_command(OUTPUT "${output_file}.h" add_custom_command(OUTPUT "${output_file}.h"
@ -68,6 +66,7 @@ macro(wayland_generate protocol_file output_file)
target_sources(displayserver_Wayland PRIVATE "${output_file}.h" "${output_file}.c") target_sources(displayserver_Wayland PRIVATE "${output_file}.h" "${output_file}.c")
endmacro() endmacro()
set(WAYLAND_PROTOCOLS_BASE "${PROJECT_TOP}/repos/wayland-protocols")
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/wayland") file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/wayland")
include_directories("${CMAKE_BINARY_DIR}/wayland") include_directories("${CMAKE_BINARY_DIR}/wayland")
wayland_generate( wayland_generate(

3
cmake/CheckSubmodule.cmake
View File

@ -2,7 +2,8 @@ if (EXISTS "${PROJECT_TOP}/.git" AND (
(NOT EXISTS "${PROJECT_TOP}/repos/cimgui/.git") OR (NOT EXISTS "${PROJECT_TOP}/repos/cimgui/.git") OR
(NOT EXISTS "${PROJECT_TOP}/repos/LGMP/.git") OR (NOT EXISTS "${PROJECT_TOP}/repos/LGMP/.git") OR
(NOT EXISTS "${PROJECT_TOP}/repos/PureSpice/.git") OR (NOT EXISTS "${PROJECT_TOP}/repos/PureSpice/.git") OR
(NOT EXISTS "${PROJECT_TOP}/repos/cimgui/imgui/.git") (NOT EXISTS "${PROJECT_TOP}/repos/cimgui/imgui/.git") OR
(NOT EXISTS "${PROJECT_TOP}/repos/wayland-protocols/.git")
)) ))
message(FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init --recursive") message(FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init --recursive")
endif() endif()

1
repos/wayland-protocols Submodule

@ -0,0 +1 @@
Subproject commit d324986823519c15b2162fc3e0a720f349e43b0c