Skip to content

Commit

Permalink
Add missing system libs deps for gtk 4 and remove unnecessary f strings
Browse files Browse the repository at this point in the history
  • Loading branch information
theartful committed Jul 1, 2022
1 parent bc120b7 commit 598afb3
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions recipes/gtk/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,18 +242,18 @@ def package(self):
if self._gtk3 and is_msvc(self) and not self.options.shared:
rename(
self,
os.path.join(self.package_folder, "lib", f"libgtk-3.a"),
os.path.join(self.package_folder, "lib", f"gtk-3.lib"),
os.path.join(self.package_folder, "lib", "libgtk-3.a"),
os.path.join(self.package_folder, "lib", "gtk-3.lib"),
)
rename(
self,
os.path.join(self.package_folder, "lib", f"libgdk-3.a"),
os.path.join(self.package_folder, "lib", f"gdk-3.lib"),
os.path.join(self.package_folder, "lib", "libgdk-3.a"),
os.path.join(self.package_folder, "lib", "gdk-3.lib"),
)
rename(
self,
os.path.join(self.package_folder, "lib", f"libgailutil-3.a"),
os.path.join(self.package_folder, "lib", f"gailutil-3.lib"),
os.path.join(self.package_folder, "lib", "libgailutil-3.a"),
os.path.join(self.package_folder, "lib", "gailutil-3.lib"),
)


Expand Down Expand Up @@ -311,6 +311,12 @@ def package_info(self):
"libepoxy::libepoxy", "graphene::graphene-gobject-1.0",
"fribidi::fribidi"
])
if self.settings.os == "Windows":
self.cpp_info.system_libs = [
"advapi32", "comctl32", "crypt32", "dwmapi", "imm32",
"setupapi", "winmm"
]

if self.settings.os == "Linux":
if self.options.with_x11:
self.cpp_info.requires.append("xorg::xorg")
Expand Down

0 comments on commit 598afb3

Please sign in to comment.