language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-09-27 20:42:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix build of C++ OpenGL underlay example

Browse source 
Test for the right feature flag and fix the compatibility feature names.
This commit is contained in:
Simon Hausmann 2023-05-23 17:25:48 +02:00
parent e2180ea0f9
commit dd04e044d0
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/cpp/CMakeLists.txt
View file

@ -112,23 +112,23 @@ define_cargo_feature(backend-qt "Enable Qt based rendering backend" ON)
define_cargo_feature(experimental "Enable experimental features (no compatibility guarantees)" OFF) define_cargo_feature(experimental "Enable experimental features (no compatibility guarantees)" OFF)
# Compat options # Compat options
option(SLINT_FEATURE_BACKEND_GL_ALL "This feature is an alias for SLINT_FEATURE_BACKEND_WINIT and SLINT_FEATURE_RENDERER_FEMTOVG." OFF) option(SLINT_FEATURE_BACKEND_GL_ALL "This feature is an alias for SLINT_FEATURE_BACKEND_WINIT and SLINT_FEATURE_RENDERER_WINIT_FEMTOVG." OFF)
option(SLINT_FEATURE_BACKEND_GL_X11 "This feature is an alias for SLINT_FEATURE_BACKEND_WINIT_X11 and SLINT_FEATURE_RENDERER_FEMTOVG." OFF) option(SLINT_FEATURE_BACKEND_GL_X11 "This feature is an alias for SLINT_FEATURE_BACKEND_WINIT_X11 and SLINT_FEATURE_RENDERER_WINIT_FEMTOVG." OFF)
option(SLINT_FEATURE_BACKEND_GL_WAYLAND "This feature is an alias for SLINT_FEATURE_BACKEND_WINIT_WAYLAND and SLINT_FEATURE_RENDERER_FEMTOVG." OFF) option(SLINT_FEATURE_BACKEND_GL_WAYLAND "This feature is an alias for SLINT_FEATURE_BACKEND_WINIT_WAYLAND and SLINT_FEATURE_RENDERER_WINIT_FEMTOVG." OFF)
if(SLINT_FEATURE_BACKEND_GL_ALL) if(SLINT_FEATURE_BACKEND_GL_ALL)
set(SLINT_FEATURE_BACKEND_WINIT ON) set(SLINT_FEATURE_BACKEND_WINIT ON)
set(SLINT_FEATURE_RENDERER_FEMTOVG ON) set(SLINT_FEATURE_RENDERER_WINIT_FEMTOVG ON)
endif() endif()
if(SLINT_FEATURE_BACKEND_GL_X11) if(SLINT_FEATURE_BACKEND_GL_X11)
set(SLINT_FEATURE_BACKEND_WINIT_X11 ON) set(SLINT_FEATURE_BACKEND_WINIT_X11 ON)
set(SLINT_FEATURE_RENDERER_FEMTOVG ON) set(SLINT_FEATURE_RENDERER_WINIT_FEMTOVG ON)
endif() endif()
if(SLINT_FEATURE_BACKEND_GL_WAYLAND) if(SLINT_FEATURE_BACKEND_GL_WAYLAND)
set(SLINT_FEATURE_BACKEND_WINIT_WAYLAND ON) set(SLINT_FEATURE_BACKEND_WINIT_WAYLAND ON)
set(SLINT_FEATURE_RENDERER_FEMTOVG ON) set(SLINT_FEATURE_RENDERER_WINIT_FEMTOVG ON)
endif() endif()
set_property( set_property(

2
examples/CMakeLists.txt
View file

@ -32,6 +32,6 @@ endif()
if (SLINT_FEATURE_INTERPRETER) if (SLINT_FEATURE_INTERPRETER)
add_subdirectory(iot-dashboard/) add_subdirectory(iot-dashboard/)
endif() endif()
if (TARGET Slint::slint-compiler AND OpenGLES2_FOUND AND(SLINT_FEATURE_BACKEND_WINIT OR SLINT_FEATURE_BACKEND_WINIT_WAYLAND OR SLINT_FEATURE_BACKEND_WINIT_X11) AND SLINT_FEATURE_RENDERER_FEMTOVG) if (TARGET Slint::slint-compiler AND OpenGLES2_FOUND AND (SLINT_FEATURE_BACKEND_WINIT OR SLINT_FEATURE_BACKEND_WINIT_WAYLAND OR SLINT_FEATURE_BACKEND_WINIT_X11) AND SLINT_FEATURE_RENDERER_WINIT_FEMTOVG)
add_subdirectory(opengl_underlay) add_subdirectory(opengl_underlay)
endif() endif()