Skip to content

Commit

Permalink
premake: add libuuid include path
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Mar 23, 2024
1 parent 33722e2 commit 233ebbe
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion recipes/premake/5.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def requirements(self):
self.requires("libcurl/[>=7.78.0 <9]")
self.requires("libzip/1.10.1")
self.requires("zlib/1.3.1")
if self.settings.os != "Windows":
if "alpha" not in self.version and self.settings.os == "Linux":

Check failure on line 52 in recipes/premake/5.x/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration)

Value 'self.version' doesn't support membership test
self.requires("util-linux-libuuid/2.39.2")
# Lua sources are required during the build and cannot be unvendored

Expand Down Expand Up @@ -114,6 +114,12 @@ def _patch_sources(self):
replace_in_file(self, os.path.join(self.source_folder, "premake5.lua"),
'"LinkTimeOptimization"', "")

# Add missing libuuid include dir
if "alpha" not in self.version and self.settings.os == "Linux":

Check failure on line 118 in recipes/premake/5.x/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration)

Value 'self.version' doesn't support membership test
libuuid_includedir = self.dependencies["util-linux-libuuid"].cpp_info.aggregated_components().includedirs[0]
replace_in_file(self, os.path.join(self.source_folder, "Bootstrap.mak"),
" -luuid", f" -luuid -I{libuuid_includedir}")

# Unvendor
for lib in ["curl", "libzip", "mbedtls", "zlib"]:
rmdir(self, os.path.join(self.source_folder, "contrib", lib))
Expand Down

0 comments on commit 233ebbe

Please sign in to comment.