From 73c07f38edd86aff5b0b37e584764278b4f1de71 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Tue, 9 Apr 2024 07:44:58 -0500 Subject: [PATCH] dbus: Use relative folders for directories Use relative folders due to this change: https://github.com/conan-io/conan/pull/15706 Remove the useless attempt to modify the separators used for the prefix path. The separators are still inconsistent for the prefix and exec_prefix on Windows. They use both backslashes and forward slashes. --- recipes/dbus/1.x.x/conanfile.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/recipes/dbus/1.x.x/conanfile.py b/recipes/dbus/1.x.x/conanfile.py index ce763ce5d1c9f..3f8c353bc153e 100644 --- a/recipes/dbus/1.x.x/conanfile.py +++ b/recipes/dbus/1.x.x/conanfile.py @@ -10,7 +10,7 @@ import os import textwrap -required_conan_version = ">=1.53.0" +required_conan_version = ">=1.64.0 <2 || >=2.2.0" class DbusConan(ConanFile): @@ -115,13 +115,11 @@ def generate(self): env = VirtualBuildEnv(self) env.generate() tc = MesonToolchain(self) - if self.settings.os == "Windows": - tc.project_options["prefix"] = self.package_folder.replace("\\", "/") tc.project_options["asserts"] = not is_apple_os(self) tc.project_options["checks"] = False - tc.project_options["datadir"] = os.path.join(self.package_folder, "res", "share") - tc.project_options["localstatedir"] = os.path.join(self.package_folder, "res", "var") - tc.project_options["sysconfdir"] = os.path.join(self.package_folder, "res", "etc") + tc.project_options["datadir"] = os.path.join("res", "share") + tc.project_options["localstatedir"] = os.path.join("res", "var") + tc.project_options["sysconfdir"] = os.path.join("res", "etc") tc.project_options["doxygen_docs"] = "disabled" tc.project_options["ducktype_docs"] = "disabled" tc.project_options["qt_help"] = "disabled" @@ -139,7 +137,7 @@ def generate(self): tc.project_options["system_pid_file"] = str(self.options.get_safe("system_pid_file", "")) tc.project_options["system_socket"] = str(self.options.get_safe("system_socket", "")) if is_apple_os(self): - tc.project_options["launchd_agent_dir"] = os.path.join(self.package_folder, "res", "LaunchAgents") + tc.project_options["launchd_agent_dir"] = os.path.join("res", "LaunchAgents") tc.project_options["x11_autolaunch"] = "enabled" if self.options.get_safe("with_x11") else "disabled" tc.project_options["xml_docs"] = "disabled" tc.generate()