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: fix backwards compatibility logic #6271

Merged
merged 2 commits into from Jan 26, 2015

Conversation

Montellese
Copy link
Member

After a comment from @garbear at https://github.com/garbear/peripheral.joystick/tree/cmake I realized that I never PR'ed this fix for the backwards compatibility logic in our cmake buildsystem which is intended to take care of being able to still build binary addons that use "xbmc" include paths instead of "kodi" ones.

The problem is that the logic overwrites the actual "kodi" header files with ones that only contain a warning and a forwarded include if the buildsystem is set up so that the "xbmc" include directory is a symlink to the "kodi" include directory.

This changes the logic to only write the forwarding header files if they don't already exist (which is the case when using a symlink).

@Montellese Montellese added the Type: Fix non-breaking change which fixes an issue label Jan 26, 2015
@wsnipex
Copy link
Member

wsnipex commented Jan 26, 2015

forgot about this one as well. It was discussed already some time ago, so
jenkins build and merge

@garbear
Copy link
Member

garbear commented Jan 26, 2015

tested the patch, symlink is present and no headers were overwritten

@jenkins4kodi jenkins4kodi merged commit a1fbf2b into xbmc:master Jan 26, 2015
@Montellese
Copy link
Member Author

Thanks for the feedback @garbear.

@Montellese Montellese deleted the fix_cmake_backwards_compat branch January 26, 2015 16:49
@MartijnKaijser MartijnKaijser modified the milestone: I******* 15.0-alpha1 Jan 26, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Fix non-breaking change which fixes an issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants