language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-11-02 21:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

C++: Make it working to have experimental withoud std

Browse source
This commit is contained in:
Olivier Goffart 2023-07-18 12:28:45 +02:00 • committed by Olivier Goffart
parent 7cffad2c3f
commit 1805e6c4c1
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/cpp/CMakeLists.txt
View file

@ -116,7 +116,7 @@ define_cargo_dependent_feature(renderer-winit-software "Enable support for the s
define_cargo_dependent_feature(backend-qt "Enable Qt based rendering backend" ON SLINT_FEATURE_STD) define_cargo_dependent_feature(backend-qt "Enable Qt based rendering backend" ON SLINT_FEATURE_STD)
define_cargo_dependent_feature(experimental "Enable experimental features (no compatibility guarantees)" OFF SLINT_FEATURE_STD) define_cargo_feature(experimental "Enable experimental features (no compatibility guarantees)" OFF)
define_cargo_dependent_feature(gettext "Enable support of translations using gettext" OFF SLINT_FEATURE_STD) define_cargo_dependent_feature(gettext "Enable support of translations using gettext" OFF SLINT_FEATURE_STD)
define_cargo_dependent_feature(accessibility "Enable integration with operating system provided accessibility APIs" ON SLINT_FEATURE_STD) define_cargo_dependent_feature(accessibility "Enable integration with operating system provided accessibility APIs" ON SLINT_FEATURE_STD)
@ -144,6 +144,10 @@ if (NOT SLINT_FEATURE_STD)
list(APPEND features i-slint-core/libm i-slint-core/unsafe-single-threaded) list(APPEND features i-slint-core/libm i-slint-core/unsafe-single-threaded)
endif() endif()
if (SLINT_FEATURE_STD AND SLINT_FEATURE_EXPERIMENTAL)
list(APPEND features experimental-skia)
endif()
set_property( set_property(
TARGET slint-cpp TARGET slint-cpp
PROPERTY CORROSION_FEATURES PROPERTY CORROSION_FEATURES

4
api/cpp/Cargo.toml
View file

@ -38,8 +38,8 @@ renderer-winit-software = ["i-slint-backend-selector/renderer-winit-software"]
gettext = ["i-slint-core/gettext-rs"] gettext = ["i-slint-core/gettext-rs"]
accessibility = ["i-slint-backend-selector/accessibility"] accessibility = ["i-slint-backend-selector/accessibility"]
experimental = ["i-slint-renderer-skia", "raw-window-handle", "experimental-platform"] experimental = []
experimental-platform = [] experimental-skia = ["i-slint-renderer-skia", "raw-window-handle", "experimental"]
std = ["image", "i-slint-core/default", "i-slint-backend-selector"] std = ["image", "i-slint-core/default", "i-slint-backend-selector"]

2
api/cpp/build.rs
View file

@ -23,7 +23,7 @@ fn main() -> Result<(), anyhow::Error> {
let enabled_features = EnabledFeatures { let enabled_features = EnabledFeatures {
interpreter: std::env::var("CARGO_FEATURE_SLINT_INTERPRETER").is_ok(), interpreter: std::env::var("CARGO_FEATURE_SLINT_INTERPRETER").is_ok(),
experimental: std::env::var("CARGO_FEATURE_SLINT_INTERPRETER").is_ok(), experimental: std::env::var("CARGO_FEATURE_EXPERIMENTAL").is_ok(),
backend_qt: std::env::var("CARGO_FEATURE_BACKEND_QT").is_ok(), backend_qt: std::env::var("CARGO_FEATURE_BACKEND_QT").is_ok(),
std: std::env::var("CARGO_FEATURE_STD").is_ok(), std: std::env::var("CARGO_FEATURE_STD").is_ok(),
}; };

2
api/cpp/lib.rs
View file

@ -10,7 +10,7 @@ use alloc::rc::Rc;
use core::ffi::c_void; use core::ffi::c_void;
use i_slint_core::window::{ffi::WindowAdapterRcOpaque, WindowAdapter}; use i_slint_core::window::{ffi::WindowAdapterRcOpaque, WindowAdapter};
#[cfg(feature = "experimental-platform")] #[cfg(feature = "experimental")]
pub mod platform; pub mod platform;
#[cfg(feature = "i-slint-backend-selector")] #[cfg(feature = "i-slint-backend-selector")]