Skip to content

Commit

Permalink
(#23437) dbus: 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
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.
  • Loading branch information
jwillikers authored Apr 12, 2024
1 parent 5e24084 commit 4522d7a
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions recipes/dbus/1.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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"
Expand All @@ -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()
Expand Down

0 comments on commit 4522d7a

Please sign in to comment.