Skip to content

Commit

Permalink
(#6187) - [libpng] set CMAKE_SYSTEM_PROCESSOR for M1
Browse files Browse the repository at this point in the history
* - [libpng] set CMAKE_SYSTEM_PROCESSOR for M1

Signed-off-by: SSE4 <tomskside@gmail.com>

* - argh, annoying hook!
  • Loading branch information
SSE4 authored Jul 8, 2021
1 parent cbfac6a commit 2b522e2
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions recipes/libpng/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ def config_options(self):
del self.options.fPIC

def configure(self):
if self.options.shared:
del self.options.fPIC
del self.settings.compiler.libcxx
del self.settings.compiler.cppstd

Expand Down Expand Up @@ -70,6 +72,8 @@ def _configure_cmake(self):
cmake.definitions["PNG_ARM_NEON"] = "on"
if self.options.api_prefix:
cmake.definitions["PNG_PREFIX"] = self.options.api_prefix
if self.settings.os == "Macos" and self.settings.arch == "armv8":
cmake.definitions["CMAKE_SYSTEM_PROCESSOR"] = "aarch64"
cmake.configure()
return cmake

Expand Down

0 comments on commit 2b522e2

Please sign in to comment.