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.

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

[cmake] linux: install cmake files in arch independent dir #10421

Merged
merged 1 commit into from Sep 7, 2016

Conversation

@wsnipex
Copy link
Member

commented Sep 7, 2016

fixes KodiConfig.cmake not being found when building on a different cpu architecture
e.g. on the PPA, when building binary addons on i386, while kodi-addon-dev was created on amd64

@fetzerch @hudokkow ping

fixes KodiConfig.cmake not being found when building on a different cpu architecture
@wsnipex

This comment has been minimized.

Copy link
Member Author

commented Sep 7, 2016

jenkins build this with addons please

@hudokkow

This comment has been minimized.

Copy link
Member

commented Sep 7, 2016

Looks good!

@akva2

This comment has been minimized.

Copy link
Contributor

commented Sep 7, 2016

No arch paths in that file sounds like something is wrong.

@wsnipex

This comment has been minimized.

Copy link
Member Author

commented Sep 7, 2016

@akva2 Sorry, I don't follow. Can you elaborate please?

@akva2

This comment has been minimized.

Copy link
Contributor

commented Sep 7, 2016

Typically /usr/lib/<arch> end up in such config files. But it was a knee jerk, thinking a bit further i guess it might very well be fine here since there are no binaries involves.

@wsnipex

This comment has been minimized.

Copy link
Member Author

commented Sep 7, 2016

yes, we had /usr/lib there, which became /usr/lib/x86_64-linux-gnu/kodi after multi-arch went in, because on the PPA kodi-addon-dev is built by amd64.
If you now build addons on i386 against those headers, which include KodiConfig.cmake, cmake doesn't find it, because it looks in /usr/lib/i686-linux-gnu/kodi.
Furthermore, cmake files are arch independent and therefore should go to /usr/share out of principle.

@akva2

This comment has been minimized.

Copy link
Contributor

commented Sep 7, 2016

Cmake files in general yes, but config files are comparabke to .pc files. You write explicit paths to linked libs and such and that makes them arch dependent. But there are no libs on KodiCondig so this pr is fine.

@wsnipex wsnipex merged commit d7c45f9 into xbmc:master Sep 7, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.