[DO-1345] fixed windows packages (!16)
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/16 Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team> Co-committed-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team>
This commit is contained in:
committed by
Aleksandr Vodyanov
parent
3759e1163f
commit
a82e89a1bc
@@ -60,7 +60,7 @@ class Dav1dConan(ConanFile):
|
||||
self.output.warning("The 'with_avx512' option is deprecated and has no effect")
|
||||
|
||||
def build_requirements(self):
|
||||
# self.tool_requires("meson/1.4.0")
|
||||
self.tool_requires("meson/[>=1.4.0<2]")
|
||||
if self.options.assembly:
|
||||
self.tool_requires("nasm/2.16.01")
|
||||
|
||||
@@ -87,6 +87,12 @@ class Dav1dConan(ConanFile):
|
||||
|
||||
def build(self):
|
||||
self._patch_sources()
|
||||
if self.settings.os == "Windows" and self.settings.compiler == "gcc":
|
||||
replace_in_file(self,
|
||||
os.path.join(self.source_folder, "meson.build"),
|
||||
"find_program('nasm'",
|
||||
"find_program('nasm.exe'",
|
||||
)
|
||||
meson = Meson(self)
|
||||
meson.configure()
|
||||
meson.build()
|
||||
|
||||
Reference in New Issue
Block a user