sdl >= 2.0.18: fix CMake options #8609
Conversation
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
We can check if the new model with self.dependencies is able to retrieve information from the build context, but we cannot use deps_cpp_info.
Probably we can just assume WAYLAND_SCANNER_1_15_FOUND=1 because the build-requires (wayland/1.19.0) is not going to be overriden.
recipes/sdl/all/conanfile.py
Outdated
| self._cmake.definitions["CONAN_INSTALL_FOLDER"] = self.install_folder | ||
| if self.settings.os != "Windows" and not self.options.shared: | ||
| self._cmake.definitions["SDL_STATIC_PIC"] = self.options.fPIC | ||
| if self.settings.compiler == "Visual Studio" and not self.options.shared: |
There was a problem hiding this comment.
| if self.settings.compiler == "Visual Studio" and not self.options.shared: | |
| if self.settings.compiler in ["Visual Studio", "msvc"] and not self.options.shared: |
wdyt? Should we start considering msvc or maybe it is better to create a tool to check for VS compiler?
There was a problem hiding this comment.
yes, there are 2 occurrences of Visual Studio, so it shouldn't be a big change. Moreover, this recipe already requires conan 1.43.0 at least.
#6155
recipes/sdl/all/conanfile.py
Outdated
| @@ -247,18 +249,84 @@ 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" | |||
There was a problem hiding this comment.
| self._cmake.definitions["WAYLAND_SCANNER_1_15_FOUND"] = tools.Version(self.deps_cpp_info["wayland"].version) >= "1.15.0" | |
| self._cmake.definitions["WAYLAND_SCANNER_1_15_FOUND"] = 1 # FIXME: Check actual build-requires version |
using deps_cpp_info we get the information from the host context, not the build one. Here we need to check the version of the build-requires, not the requires
There was a problem hiding this comment.
I'll revert this change, didn't see that wayland was also in build requirements.
recipes/sdl/all/conanfile.py
Outdated
| # 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"] = tools.Version(self.deps_cpp_info["wayland"].version) >= "1.15.0" |
There was a problem hiding this comment.
| self._cmake.definitions["WAYLAND_SCANNER_1_15_FOUND"] = tools.Version(self.deps_cpp_info["wayland"].version) >= "1.15.0" | |
| self._cmake.definitions["WAYLAND_SCANNER_1_15_FOUND"] = 1 # FIXME: Check actual build-requires version |
Probably here it also want to check the version from the build context.
This reverts commit daa7008.
* fix CMake options if version >= 2.0.18 * properly check wayland version * Revert "properly check wayland version" This reverts commit daa7008. * add compiler=msvc support
Specify library name and version: lib/1.0
closes #8607
conan-center hook activated.