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

Fix compilation failure in android #77

Closed
wants to merge 1 commit into from
Closed

Fix compilation failure in android #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions recipes/libpng/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ def package_info(self):
self.cpp_info.libs = ['libpng16']
else:
self.cpp_info.libs = ["png16"]
if self.settings.os == "Linux":
self.cpp_info.libs.append("m")
self.cpp_info.libs.append("m")
Copy link
Contributor

Choose a reason for hiding this comment

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

Probably is safer to keep the "IF" adding android, otherwise other NIX systems might suffer.

# use 'd' suffix everywhere except mingw
if self.settings.build_type == "Debug" and not (self.settings.os == "Windows" and self.settings.compiler == "gcc"):
self.cpp_info.libs[0] += "d"
6 changes: 4 additions & 2 deletions recipes/libwebp/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,7 @@ def package_info(self):
self.cpp_info.libs = ['webpmux', 'webpdemux', 'webpdecoder', 'webp']
if self.options.shared and self.settings.os == "Windows" and self.settings.compiler != 'Visual Studio':
self.cpp_info.libs = [lib + '.dll' for lib in self.cpp_info.libs]
if self.settings.os == "Linux":
self.cpp_info.libs.append("pthread")
if self.settings.os != "Windows":
Copy link
Contributor

Choose a reason for hiding this comment

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

Same comment, limit changes to Android. It might have collateral issues for NIX systems.
Please do different PRs to change different libraries.
Thanks!

self.cpp_info.libs.append("m")
if self.settings.os != "Android":
self.cpp_info.libs.append("pthread")