Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vulkan-loader: modernize more for conan v2 #16232

Merged
merged 2 commits into from
Mar 23, 2023
Merged

vulkan-loader: modernize more for conan v2 #16232

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c5ffcf
modernize more
SpaceIm Feb 22, 2023
2b4d29f
self.output.warning instead of self.output.warn
SpaceIm Mar 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions recipes/vulkan-loader/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
from conan.errors import ConanInvalidConfiguration
from conan.tools.apple import is_apple_os
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
from conan.tools.env import Environment, VirtualBuildEnv
from conan.tools.env import VirtualBuildEnv
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, replace_in_file, rmdir
from conan.tools.gnu import PkgConfigDeps
from conan.tools.microsoft import check_min_vs
from conan.tools.scm import Version
import os

required_conan_version = ">=1.53.0"
required_conan_version = ">=1.55.0"


class VulkanLoaderConan(ConanFile):
Expand Down Expand Up @@ -68,7 +69,7 @@ def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
self.requires(f"vulkan-headers/{self.version}")
self.requires(f"vulkan-headers/{self.version}", transitive_headers=True)
if self.options.get_safe("with_wsi_xcb") or self.options.get_safe("with_wsi_xlib"):
self.requires("xorg/system")
if Version(self.version) < "1.3.231" and self.options.get_safe("with_wsi_wayland"):
Expand All @@ -80,22 +81,21 @@ def validate(self):
raise ConanInvalidConfiguration("Conan recipe for DirectFB is not available yet.")
if not is_apple_os(self) and not self.options.shared:
raise ConanInvalidConfiguration(f"Static builds are not supported on {self.settings.os}")
if self.settings.compiler == "Visual Studio" and Version(self.settings.compiler.version) < 15:
# FIXME: It should build but Visual Studio 2015 container in CI of CCI seems to lack some Win SDK headers
raise ConanInvalidConfiguration("Visual Studio < 2017 not yet supported in this recipe")
# FIXME: It should build but Visual Studio 2015 container in CI of CCI seems to lack some Win SDK headers
check_min_vs(self, "191")
# TODO: to replace by some version range check
if self.dependencies["vulkan-headers"].ref.version != self.version:
self.output.warn("vulkan-loader should be built & consumed with the same version than vulkan-headers.")
self.output.warning("vulkan-loader should be built & consumed with the same version than vulkan-headers.")

def build_requirements(self):
if self._is_pkgconf_needed:
self.tool_requires("pkgconf/1.9.3")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/1.9.3")
if self._is_mingw:
self.tool_requires("jwasm/2.13")

def source(self):
get(self, **self.conan_data["sources"][self.version],
destination=self.source_folder, strip_root=True)
get(self, **self.conan_data["sources"][self.version], strip_root=True)

def generate(self):
if self._is_pkgconf_needed or self._is_mingw:
Expand Down Expand Up @@ -126,10 +126,6 @@ def generate(self):
if self._is_pkgconf_needed:
pkg = PkgConfigDeps(self)
pkg.generate()
# TODO: to remove when properly handled by conan (see https://github.com/conan-io/conan/issues/11962)
env = Environment()
env.prepend_path("PKG_CONFIG_PATH", self.generators_folder)
env.vars(self).save_script("conanbuildenv_pkg_config_path")

def _patch_sources(self):
apply_conandata_patches(self)
Expand Down Expand Up @@ -178,10 +174,7 @@ def package_info(self):
self.cpp_info.libs = [f"vulkan{suffix}"]

# allow to properly set Vulkan_INCLUDE_DIRS in CMake like generators
vulkan_headers = self.dependencies["vulkan-headers"]
self.cpp_info.includedirs = [
os.path.join(vulkan_headers.package_folder, includedir) for includedir in vulkan_headers.cpp_info.includedirs
]
self.cpp_info.includedirs = self.dependencies["vulkan-headers"].cpp_info.aggregated_components().includedirs

if self.settings.os in ["Linux", "FreeBSD"]:
self.cpp_info.system_libs = ["dl", "pthread", "m"]
Expand Down