Skip to content

Commit 785a2ed

Browse files
committed
dbus: Use relative folders for directories
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.
1 parent a642ea3 commit 785a2ed

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

recipes/dbus/1.x.x/conanfile.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import os
1111
import textwrap
1212

13-
required_conan_version = ">=1.53.0"
13+
required_conan_version = ">=1.64.0 <2 || >=2.2.0"
1414

1515

1616
class DbusConan(ConanFile):
@@ -115,13 +115,11 @@ def generate(self):
115115
env = VirtualBuildEnv(self)
116116
env.generate()
117117
tc = MesonToolchain(self)
118-
if self.settings.os == "Windows":
119-
tc.project_options["prefix"] = self.package_folder.replace("\\", "/")
120118
tc.project_options["asserts"] = not is_apple_os(self)
121119
tc.project_options["checks"] = False
122-
tc.project_options["datadir"] = os.path.join(self.package_folder, "res", "share")
123-
tc.project_options["localstatedir"] = os.path.join(self.package_folder, "res", "var")
124-
tc.project_options["sysconfdir"] = os.path.join(self.package_folder, "res", "etc")
120+
tc.project_options["datadir"] = os.path.join("res", "share")
121+
tc.project_options["localstatedir"] = os.path.join("res", "var")
122+
tc.project_options["sysconfdir"] = os.path.join("res", "etc")
125123
tc.project_options["doxygen_docs"] = "disabled"
126124
tc.project_options["ducktype_docs"] = "disabled"
127125
tc.project_options["qt_help"] = "disabled"
@@ -139,7 +137,7 @@ def generate(self):
139137
tc.project_options["system_pid_file"] = str(self.options.get_safe("system_pid_file", ""))
140138
tc.project_options["system_socket"] = str(self.options.get_safe("system_socket", ""))
141139
if is_apple_os(self):
142-
tc.project_options["launchd_agent_dir"] = os.path.join(self.package_folder, "res", "LaunchAgents")
140+
tc.project_options["launchd_agent_dir"] = os.path.join("res", "LaunchAgents")
143141
tc.project_options["x11_autolaunch"] = "enabled" if self.options.get_safe("with_x11") else "disabled"
144142
tc.project_options["xml_docs"] = "disabled"
145143
tc.generate()

0 commit comments

Comments
 (0)