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 ninja (fixes: #15008) #15011

Merged
merged 1 commit into from
Dec 11, 2018
Merged

[cmake] Fix ninja (fixes: #15008) #15011

merged 1 commit into from
Dec 11, 2018

Conversation

wsnipex
Copy link
Member

@wsnipex wsnipex commented Dec 7, 2018

Description

remove duplicate output target for addons/xbmc.json/addon.xml

Motivation and Context

see #15008

How Has This Been Tested?

only quickly on ubuntu. I'm not 100% certain this does not have an side effects...

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • None of the above (please explain below)

Checklist:

  • My code follows the Code Guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the Contributing document
  • I have added tests to cover my change
  • All new and existing tests passed

@wsnipex wsnipex added Type: Fix non-breaking change which fixes an issue CMake labels Dec 7, 2018
cmake/scripts/common/Macros.cmake Outdated Show resolved Hide resolved
cmake/scripts/common/Macros.cmake Outdated Show resolved Hide resolved
@wsnipex
Copy link
Member Author

wsnipex commented Dec 7, 2018

updated

@wsnipex
Copy link
Member Author

wsnipex commented Dec 7, 2018

jenkins build this please

@MilhouseVH
Copy link
Contributor

Tested this with LibreELEC and it's all good with the addition of the fixup commit (xbmc.json/addon.xml isn't installed without the fixup commit). Thanks @wsnipex

@wsnipex
Copy link
Member Author

wsnipex commented Dec 7, 2018

jenkins build this please

@candrews
Copy link
Contributor

Can this please be considered for Kodi 18?

@wsnipex
Copy link
Member Author

wsnipex commented Dec 10, 2018

I'd like confirmation that it doesn't somehow break windows first

@candrews
Copy link
Contributor

candrews commented Dec 10, 2018

On that note, should Travis and/or Appveyor be configured to use ninja?

Also, is Travis still used? Travis seems to be disabled for xbmc/xbmc, and when I run it on my own, the build fails due to missing flatbuffers. (If it isn't used, can .travis.yml be deleted to eliminate confusion?)

@DaveTBlake
Copy link
Member

I'd like confirmation that it doesn't somehow break windows first

Seems fine @wsnipex ran a Windows x64 build and JSON commands were working as expected.

@wsnipex wsnipex merged commit df3be01 into xbmc:master Dec 11, 2018
@Rechi Rechi added this to the Leia 18.0-rc3 milestone Dec 11, 2018
@gentoo-junkie
Copy link

gentoo-junkie commented Jan 4, 2019

Hi, could you please merge into feature_python3 branch and I will test it there.

[Edit] I patched my local copy of feature_python3 branch with your commit and it built successfully.

@fritsch
Copy link
Member

fritsch commented Jan 4, 2019

Just cherry-pick it ...

Edit: Did not see your Edit

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants