diff --git a/recipes/sdl/all/conanfile.py b/recipes/sdl/all/conanfile.py index 58a4970c2cd13..031fab6273fd3 100644 --- a/recipes/sdl/all/conanfile.py +++ b/recipes/sdl/all/conanfile.py @@ -249,7 +249,7 @@ def _configure_cmake(self): # FIXME: Otherwise 2.0.16 links with system wayland (from egl/system requirement) cmake_extra_ldflags += ["-L{}".format(os.path.join(self.deps_cpp_info["wayland"].rootpath, it)) for it in self.deps_cpp_info["wayland"].libdirs] self._cmake.definitions["WAYLAND_SHARED"] = self.options["wayland"].shared - self._cmake.definitions["WAYLAND_SCANNER_1_15_FOUND"] = 1 # FIXME: Check actual build-requires version + self._cmake.definitions["WAYLAND_SCANNER_1_15_FOUND"] = tools.Version(self.deps_cpp_info["wayland"].version) >= "1.15.0" self._cmake.definitions["VIDEO_DIRECTFB"] = self.options.directfb self._cmake.definitions["VIDEO_RPI"] = self.options.video_rpi @@ -315,7 +315,7 @@ def _configure_cmake(self): # FIXME: Otherwise 2.0.16 links with system wayland (from egl/system requirement) cmake_extra_ldflags += ["-L{}".format(os.path.join(self.deps_cpp_info["wayland"].rootpath, it)) for it in self.deps_cpp_info["wayland"].libdirs] self._cmake.definitions["SDL_WAYLAND_SHARED"] = self.options["wayland"].shared - self._cmake.definitions["WAYLAND_SCANNER_1_15_FOUND"] = 1 # FIXME: Check actual build-requires version + self._cmake.definitions["WAYLAND_SCANNER_1_15_FOUND"] = tools.Version(self.deps_cpp_info["wayland"].version) >= "1.15.0" self._cmake.definitions["SDL_DIRECTFB"] = self.options.directfb self._cmake.definitions["SDL_RPI"] = self.options.video_rpi