Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

- [libpng] set CMAKE_SYSTEM_PROCESSOR for M1 #6187

Merged
merged 2 commits into from
Jul 8, 2021
Merged

- [libpng] set CMAKE_SYSTEM_PROCESSOR for M1 #6187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2962d6
- [libpng] set CMAKE_SYSTEM_PROCESSOR for M1
SSE4 Jul 6, 2021
1ba6329
- argh, annoying hook!
SSE4 Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions recipes/libpng/all/conanfile.py
View file
Open in desktop
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"
Comment on lines +75 to +76
Copy link
Contributor

@SpaceIm SpaceIm Jul 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It fails also for iOS, but I don't know which CMAKE_SYSTEM_PROCESSOR to set.
ok: #2366, maybe this recipe should use autotools for non-Windows platform

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, in fact, this is only required when cross-building (because we are not using toolchain file)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iOS has different architectures (armv7, armv8 and their variants), so CMAKE_SYSTEM_PROCESSOR will have different values

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, my suggestion is to force this value only for the cross-building scenario, otherwise, in a native build I would expect it to work out of the box. wdyt?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as I understand, in native builds CMAKE_SYSTEM_PROCESSOR defaults to CMAKE_HOST_SYSTEM_PROCESSOR which should be auto-detected to aarch64 by cmake itself? still, I don't have ARM M1 laptop to check it, so no idea if it works without explicit definition...

Copy link
Contributor

@SpaceIm SpaceIm Jul 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works for iOS:

        if tools.is_apple_os(self.settings.os):
            if "arm" in self.settings.arch:
                cmake.definitions["PNG_ARM_NEON"] = "on" if self.settings.os == "Macos" else "off"
            if self.settings.arch == "armv8":
                cmake.definitions["CMAKE_SYSTEM_PROCESSOR"] = "aarch64"

I would expect conan to handle this automatically (except PNG_ARM_NEON of course, here we should switch to autotools, it seems to properly handle neon for iOS).

cmake.configure()
return cmake

Expand Down