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] make sure CXX11 is also always set for addons #15987

Merged
merged 1 commit into from
Apr 29, 2019

Conversation

wsnipex
Copy link
Member

@wsnipex wsnipex commented Apr 25, 2019

Description

set cxx11 also for addons

Motivation and Context

fix fallout from #15781

How Has This Been Tested?

only locally compiled on ubuntu 18.04, so not yet verified on affected travis builders

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 requested review from ksooo and Rechi April 25, 2019 14:06
@ksooo
Copy link
Member

ksooo commented Apr 26, 2019

Sorry, cannot review due to lack of cmake knowledge and no idea how to runtime-test this.

Copy link
Member

@AlwinEsch AlwinEsch left a comment

Choose a reason for hiding this comment

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

From my side OK, but think is not enough.
By this is it only be used on the addons build way over Kodi itself.

If a addon is created independent are this values maybe not present.
By e.g.:
cmake -DADDONS_TO_BUILD=visualization.waveform -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons

This generated the: /build/build/depends/lib/kodi folder for addon with the following files:

  • AddonHelpers.cmake
  • AddOptions.cmake
  • KodiConfig.cmake
  • PrepareEnv.cmake

Maybe are the sets done on background, but not sure if everywhere present, the other on Linux/Ubuntu where this is on /usr/lib/kodi is not available.

EDIT: Some are set on KodiConfig.cmake only the CMAKE_ASM_FLAGS not

@AlwinEsch
Copy link
Member

Ignore a bit my comment before, think your problem is mainly dependent to the depends build where KodiConfig.cmake becomes not used.

@ksooo
Copy link
Member

ksooo commented Apr 29, 2019

Is this good to go in?

@wsnipex wsnipex merged commit 192575d into xbmc:master Apr 29, 2019
@Rechi Rechi added CMake Type: Fix non-breaking change which fixes an issue v19 Matrix labels Apr 30, 2019
@Rechi Rechi added this to the M** 19.0-alpha 1 milestone Apr 30, 2019
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 v19 Matrix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants