[cmake] fix set of APP_RENDER_SYSTEM on KodiConfig.cmake #15642

AlwinEsch · 2019-03-01T18:59:06Z

Description

In the implementation of GLES under Windows found the foolish finding of OpenGL. This seems to exist systematically and makes it a little harder. Then found that "APP_RENDER_SYSTEM" of "KodiConfig.cmake" is not defined correctly (empty defined).

This request fixes this and uses the "platform" folder.
Parts of "Platform.cmake" are also included in PrepareEnv.cmake.

But good to include them also in PrepareEnv.cmake to fix for addons?

Motivation and Context

How Has This Been Tested?

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

cmake/scripts/common/PrepareEnv.cmake

+  file(GLOB _platformnames RELATIVE ${CORE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/
+                                    ${CORE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/*.cmake)
+  string(REPLACE ".cmake" " " _platformnames ${_platformnames})
+  message(FATAL_ERROR "invalid CORE_PLATFORM_NAME: ${CORE_PLATFORM_NAME_LC}\nValid platforms: ${_platformnames}")


AlwinEsch · 2019-03-07T22:28:19Z

How is the state about them, OK to bring in?

wsnipex · 2019-03-10T14:36:43Z

cmake/scripts/common/Platform.cmake

+  set(PLATFORM_USED_SOURCE_DIR ${CORE_SOURCE_DIR})
+else()
+  set(PLATFORM_USED_SOURCE_DIR ${CMAKE_SOURCE_DIR})
+endif()


Please explain this block. Both kodi and addons have CORE_SOURCE_DIR defined and pointing to the same main kodi source root, so we should be able to use CORE_SOURCE_DIR directly

Is a bit a hen and egg problem.

On Kodi build it must be included on begin and CORE_SOURCE_DIR not set:
https://github.com/xbmc/xbmc/blob/master/CMakeLists.txt#L32
This then becomes set by https://github.com/xbmc/xbmc/blob/master/CMakeLists.txt#L36, and I think https://github.com/xbmc/xbmc/blob/master/cmake/scripts/common/Macros.cmake#L8 need a bit the defines from Platform.cmake.

EDIT: Am unsure to change the place and not inadvertently bring in a hidden mistake

from a quick look it shouldn't be a problem to set CORE_SOURCE_DIR on top of the main CMakeLists.txt

Have checked, it does not work in other way without a bigger rewrite.

Platform.cmake define the CORE_SYSTEM_NAME

CORE_SYSTEM_NAME required by Macros.cmake

CORE_SOURCE_DIR on common/Macros.cmake not allowed to set before, otherwise ${CORE_SYSTEM_NAME}/Macros.cmake is not included

Not sure if this request fix something on my screensavers.rsxs Jenkins problem, but maybe it bring something :-)

@wsnipex what you think about?

I still think this should be refactored, but since that needs deeper changes we can leave it as is for v18. But please add a TODO comment that this should be fixed for v19

Also heard that v19 is planning to restructure the CMake for addons. Maybe we could integrate it with it (or maybe it's already ;-)). Otherwise, I will see what can be done.

In the implementation of GLES under Windows found the foolish finding of OpenGL. This seems to exist systematically and makes it a little harder. Then found that "APP_RENDER_SYSTEM" of "KodiConfig.cmake" is not defined correctly (empty defined). This request fixes this and uses the "platform" folder. Parts of "Platform.cmake" are also included in PrepareEnv.cmake. TODO: Refactor on v19 to remove the if/else usage

Rechi · 2019-03-23T08:15:37Z

@AlwinEsch This broke compiling binary addons via depends for GBM and Wayland platform.

AlwinEsch · 2019-03-23T14:23:39Z

Can you give the error output, if not easy to fix this request becomes reverted from me.

Rechi · 2019-03-23T14:55:06Z

CMake Error at /home/jenkins/workspace/LINUX-64-GBM/cmake/platform/linux/gbm.cmake:13 (message):
  You need to decide whether you want to use GL- or GLES-based rendering in
  combination with the GBM windowing system.  Please set GBM_RENDER_SYSTEM to
  either "gl" or "gles".  For normal desktop systems, you will usually want
  to use "gl".
Call Stack (most recent call first):
  /home/jenkins/workspace/LINUX-64-GBM/cmake/scripts/common/Platform.cmake:37 (include)
  /home/jenkins/workspace/LINUX-64-GBM/tools/depends/target/binary-addons/x86_64-linux-gnu-debug/build/depends/lib/kodi/PrepareEnv.cmake:3 (include)
  CMakeLists.txt:186 (include)

With the include of Platform.cmake to have for addons is the GBM_RENDER_SYSTEM not defined, this becomes set from "./tools/depends/target/Toolchain.cmake" but on a other place. This remove the change, but after the release must be the cmake workflow cleaned up. There are some hen and egg problems and maybe some hidden faults where a value becomes checked which becomes never available.

[cmake] partly revert #15642 to have wayland and GBM working

With the include of Platform.cmake to have for addons is the GBM_RENDER_SYSTEM not defined, this becomes set from "./tools/depends/target/Toolchain.cmake" but on a other place. This remove the change, but after the release must be the cmake workflow cleaned up. There are some hen and egg problems and maybe some hidden faults where a value becomes checked which becomes never available.

AlwinEsch added Type: Fix non-breaking change which fixes an issue Component: Binary add-ons CMake v18 Leia labels Mar 1, 2019

AlwinEsch commented Mar 1, 2019

View reviewed changes

AlwinEsch force-pushed the fix-addon-cmake branch 3 times, most recently from 98fa02f to e77f7c3 Compare March 1, 2019 21:00

AlwinEsch added this to the Leia 18.2-rc1 milestone Mar 2, 2019

AlwinEsch mentioned this pull request Mar 3, 2019

add support for GLES on Windows over angle xbmc/screensaver.matrixtrails#16

Merged

wsnipex reviewed Mar 10, 2019

View reviewed changes

AlwinEsch force-pushed the fix-addon-cmake branch from e77f7c3 to 3f0b2e7 Compare March 14, 2019 18:12

jenkins4kodi added the Rebase needed PR that does not apply/merge cleanly to current base branch label Mar 19, 2019

AlwinEsch force-pushed the fix-addon-cmake branch from b08b6a9 to 84d607d Compare March 19, 2019 23:34

jenkins4kodi removed the Rebase needed PR that does not apply/merge cleanly to current base branch label Mar 19, 2019

AlwinEsch force-pushed the fix-addon-cmake branch from 84d607d to 34d0c4a Compare March 20, 2019 19:51

AlwinEsch merged commit 36dad43 into xbmc:master Mar 21, 2019

AlwinEsch deleted the fix-addon-cmake branch March 21, 2019 17:33

AlwinEsch added a commit that referenced this pull request Mar 23, 2019

Merge pull request #15804 from AlwinEsch/partly-fix-cmake

98d18d0

[cmake] partly revert #15642 to have wayland and GBM working

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[cmake] fix set of APP_RENDER_SYSTEM on KodiConfig.cmake #15642

[cmake] fix set of APP_RENDER_SYSTEM on KodiConfig.cmake #15642

AlwinEsch commented Mar 1, 2019 •

edited

This comment was marked as outdated.

AlwinEsch commented Mar 7, 2019

wsnipex Mar 10, 2019

AlwinEsch Mar 10, 2019 •

edited

wsnipex Mar 11, 2019

AlwinEsch Mar 11, 2019 •

edited

AlwinEsch Mar 19, 2019

wsnipex Mar 20, 2019

AlwinEsch Mar 20, 2019

Rechi commented Mar 23, 2019

AlwinEsch commented Mar 23, 2019

Rechi commented Mar 23, 2019

[cmake] fix set of APP_RENDER_SYSTEM on KodiConfig.cmake #15642

[cmake] fix set of APP_RENDER_SYSTEM on KodiConfig.cmake #15642

Conversation

AlwinEsch commented Mar 1, 2019 • edited

Description

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of change

Checklist:

This comment was marked as outdated.

AlwinEsch commented Mar 7, 2019

wsnipex Mar 10, 2019

Choose a reason for hiding this comment

AlwinEsch Mar 10, 2019 • edited

Choose a reason for hiding this comment

wsnipex Mar 11, 2019

Choose a reason for hiding this comment

AlwinEsch Mar 11, 2019 • edited

Choose a reason for hiding this comment

AlwinEsch Mar 19, 2019

Choose a reason for hiding this comment

wsnipex Mar 20, 2019

Choose a reason for hiding this comment

AlwinEsch Mar 20, 2019

Choose a reason for hiding this comment

Rechi commented Mar 23, 2019

AlwinEsch commented Mar 23, 2019

Rechi commented Mar 23, 2019

AlwinEsch commented Mar 1, 2019 •

edited

AlwinEsch Mar 10, 2019 •

edited

AlwinEsch Mar 11, 2019 •

edited