From a200b88d6f10f8c6159bdb0fcb952c6989e3c63b Mon Sep 17 00:00:00 2001 From: Croydon Date: Fri, 1 Jan 2021 19:02:41 +0100 Subject: [PATCH] sdl2_image: simplify imageio handling --- recipes/sdl2_image/all/conanfile.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/recipes/sdl2_image/all/conanfile.py b/recipes/sdl2_image/all/conanfile.py index e8fda05c..79bd11c7 100644 --- a/recipes/sdl2_image/all/conanfile.py +++ b/recipes/sdl2_image/all/conanfile.py @@ -86,6 +86,7 @@ def _configure_cmake(self): self._cmake = CMake(self) self._cmake.definitions["BMP"] = self.options.bmp self._cmake.definitions["GIF"] = self.options.gif + self._cmake.definitions["IMAGEIO"] = self.options.get_safe("imageio") self._cmake.definitions["JPG"] = self.options.jpg self._cmake.definitions["LBM"] = self.options.lbm self._cmake.definitions["PCX"] = self.options.pcx @@ -103,10 +104,6 @@ def _configure_cmake(self): self._cmake.definitions["PNG_DYNAMIC"] = self.options["libpng"].shared if self.options.png else False self._cmake.definitions["WEBP_DYNAMIC"] = self.options["libwebp"].shared if self.options.webp else False self._cmake.definitions["SDL2_DYNAMIC"] = self.options["sdl2"].shared - if self.settings.os == "Macos": - self._cmake.definitions["IMAGEIO"] = self.options.imageio - else: - self._cmake.definitions["IMAGEIO"] = False self._cmake.configure(build_dir="build") return self._cmake