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

Jump to bottom

libdrm: Use relative folders for directories #23438

Merged
merged 4 commits into from
Apr 17, 2024
Merged

libdrm: Use relative folders for directories #23438

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6bf4e9
libdrm: Use relative folders for directories
jwillikers Apr 9, 2024
69654cc
Merge branch 'master' into libdrm-relative-dirs
jwillikers Apr 11, 2024
ba71a60
Merge branch 'master' into libdrm-relative-dirs
AbrilRBS Apr 12, 2024
25b10a9
Merge branch 'master' into libdrm-relative-dirs
franramirez688 Apr 12, 2024
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
8 changes: 4 additions & 4 deletions recipes/libdrm/all/conanfile.py
View file
Open in desktop
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
Loading