Skip to content

Commit

Permalink
libdrm: Use relative folders for directories
Browse files Browse the repository at this point in the history
Use relative folders due to this change: conan-io/conan#15706.
Bump Meson to 1.4.0.
  • Loading branch information
jwillikers committed Apr 9, 2024
1 parent a642ea3 commit a53667b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions recipes/libdrm/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from conan.tools.meson import MesonToolchain, Meson
from conan.tools.scm import Version

required_conan_version = ">=1.53.0"
required_conan_version = ">=1.64.0 <2 || >=2.2.0"


class LibdrmConan(ConanFile):
Expand Down Expand Up @@ -88,7 +88,7 @@ def validate(self):
raise ConanInvalidConfiguration("libdrm supports only Linux or FreeBSD")

def build_requirements(self):
self.tool_requires("meson/1.3.0")
self.tool_requires("meson/1.4.0")
if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
self.tool_requires("pkgconf/2.1.0")

Expand Down Expand Up @@ -116,8 +116,8 @@ def generate(self):
else:
tc.project_options[o] = "true" if getattr(self.options, o) else "false"

tc.project_options["datadir"] = os.path.join(self.package_folder, "res")
tc.project_options["mandir"] = os.path.join(self.package_folder, "res", "man")
tc.project_options["datadir"] = "res"
tc.project_options["mandir"] = os.path.join("res", "man")
tc.generate()

def build(self):
Expand Down

0 comments on commit a53667b

Please sign in to comment.