From 6921b7c38989e7fdb9b4ec72e3ba852586d94473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Mon, 23 Sep 2024 20:33:15 +0200 Subject: [PATCH] Cleanup --- recipes/sfml/all/conanfile.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/recipes/sfml/all/conanfile.py b/recipes/sfml/all/conanfile.py index 31526ce1ac7f2..e8eda55aff929 100644 --- a/recipes/sfml/all/conanfile.py +++ b/recipes/sfml/all/conanfile.py @@ -52,7 +52,7 @@ class SfmlConan(ConanFile): @property def _min_compiler_versions(self): return { - "gcc": 9 + "gcc": 11 } @property @@ -94,7 +94,7 @@ def requirements(self): if self.settings.os in ["Linux", "FreeBSD"]: if self.options.get_safe("use_drm"): self.requires("libdrm/2.4.120") - # TODO + # TODO, for now this branch is validate()ed out # self.requires("libgbm/20.3.0") # Missing in CCI? else: self.requires("xorg/system") @@ -173,19 +173,17 @@ def generate(self): tc.cache_variables["SFML_USE_MESA3D"] = False # self.options.use_mesa3d tc.variables["SFML_INSTALL_PKGCONFIG_FILES"] = False - # TODO: Back to false when no more testing is needed - tc.variables["SFML_CONFIGURE_EXTRAS"] = True - # TODO: Remove when no longer testing, this is useful for now to check - tc.variables["SFML_BUILD_EXAMPLES"] = True - tc.cache_variables["SFML_WARNINGS_AS_ERRORS"] = False + # Tip: You can use this locally to test the extras when adding a new version, + # uncomment both to build examples, or run them manually + # tc.variables["SFML_CONFIGURE_EXTRAS"] = True + # tc.variables["SFML_BUILD_EXAMPLES"] = True + # TODO: Remove in Conan 2 if not self.settings.compiler.cppstd: tc.cache_variables["CMAKE_CXX_STANDARD"] = self._min_cppstd - # tc.cache_variables["SFML_MISC_INSTALL_PREFIX"] = os.path.join(self.package_folder, "licenses").replace("\\", "/") - tc.generate() deps = CMakeDeps(self) deps.set_property("flac", "cmake_file_name", "FLAC")