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

[binary addons] a few cmake fixes #9582

Merged
merged 4 commits into from
Apr 12, 2016

Conversation

Montellese
Copy link
Member

Based on the comments in 068aafc I tried the binary addons buildsystem again and found some oddities. The first two commits are actual fixes and the other two are cosmetics.

I've only tested this on win32.

@Montellese Montellese added Type: Fix non-breaking change which fixes an issue Type: Improvement non-breaking change which improves existing functionality Component: Binary add-ons CMake labels Apr 8, 2016
@FernetMenta
Copy link
Contributor

Thanks! Tested on Linux and I was able to build two addons after having cleared cmake/addons/addons.
If this folder already has some content from previous builds, cmake fails silently. Means it just ignored the additional or different addons. Scenario:
I work on pvr.vdr.vnsi and built this addon. This folder was created: cmake/addons/addons/pvr.vdr.vnsi. Now I switch to inputstream.mpd and build this. the folder inputstream.mpd won't get created as long addons/addons is not empty. There is no error on the output of cmake.

@wsnipex
Copy link
Member

wsnipex commented Apr 9, 2016

Did you bootstrap the addon repo? I am pretty sure it has to do with that as it worked fine before when we still had the addon definitions in kodi src

@Montellese
Copy link
Member Author

@wsnipex: This is a case that never worked (at least for me). The problem is that we run cmake to generate the buildsystem on the addons directory and after the buildsystem has been generated you change the content of the addons directory. But cmake sees that the buildsystem has already been generated and doesn't care about the changes that have been made to the addons directory.

The case where there are multiple addon definitions available but you only build one and then later on another one should still work (and works fine for me on win32).

@FernetMenta
Copy link
Contributor

@Montellese can we merge this?

@FernetMenta FernetMenta added this to the Krypton 17.0-alpha1 milestone Apr 12, 2016
@Montellese
Copy link
Member Author

jenkins build and merge

@jenkins4kodi jenkins4kodi merged commit 0fe3822 into xbmc:master Apr 12, 2016
@Montellese Montellese deleted the cmake_addons_fixes branch April 12, 2016 07:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake Component: Binary add-ons Type: Fix non-breaking change which fixes an issue Type: Improvement non-breaking change which improves existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants