Skip to content

Commit a53667b

Browse files
committed
libdrm: Use relative folders for directories
Use relative folders due to this change: conan-io/conan#15706. Bump Meson to 1.4.0.
1 parent a642ea3 commit a53667b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

recipes/libdrm/all/conanfile.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from conan.tools.meson import MesonToolchain, Meson
1010
from conan.tools.scm import Version
1111

12-
required_conan_version = ">=1.53.0"
12+
required_conan_version = ">=1.64.0 <2 || >=2.2.0"
1313

1414

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

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

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

119-
tc.project_options["datadir"] = os.path.join(self.package_folder, "res")
120-
tc.project_options["mandir"] = os.path.join(self.package_folder, "res", "man")
119+
tc.project_options["datadir"] = "res"
120+
tc.project_options["mandir"] = os.path.join("res", "man")
121121
tc.generate()
122122

123123
def build(self):

0 commit comments

Comments
 (0)