Skip to content

Commit

Permalink
[cmake] partly revert xbmc#15642 to have wayland and GBM working
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
AlwinEsch authored and fuzzard committed Apr 13, 2019
1 parent a06f4d7 commit e5a568e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
19 changes: 4 additions & 15 deletions cmake/scripts/common/Platform.cmake
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
if(NOT CORE_SYSTEM_NAME)
string(TOLOWER ${CMAKE_SYSTEM_NAME} CORE_SYSTEM_NAME)
endif()
# Switch used path, if CORE_SOURCE_DIR is set use it (e.g. on addons build)
# otherwise use the present source dir
#
# TODO: This should be refactored on v19 and the if usage removed!
if(CORE_SOURCE_DIR)
set(PLATFORM_USED_SOURCE_DIR ${CORE_SOURCE_DIR})
else()
set(PLATFORM_USED_SOURCE_DIR ${CMAKE_SOURCE_DIR})
endif()

if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd)
# Set default CORE_PLATFORM_NAME to X11
Expand All @@ -33,16 +24,14 @@ unset(_DEFAULT_PLATFORM)
string(TOLOWER ${CORE_PLATFORM_NAME} CORE_PLATFORM_NAME_LC)

list(APPEND final_message "Platform: ${CORE_PLATFORM_NAME}")
if(EXISTS ${PLATFORM_USED_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}.cmake)
include(${PLATFORM_USED_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}.cmake)
if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}.cmake)
include(${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}.cmake)
if(ENABLE_APP_AUTONAME)
set(APP_BINARY_SUFFIX "-${CORE_PLATFORM_NAME_LC}")
endif()
else()
file(GLOB _platformnames RELATIVE ${PLATFORM_USED_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/
${PLATFORM_USED_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/*.cmake)
file(GLOB _platformnames RELATIVE ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/
${CMAKE_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}")
endif()

unset(PLATFORM_USED_SOURCE_DIR)
1 change: 0 additions & 1 deletion cmake/scripts/common/PrepareEnv.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# parse version.txt and versions.h to get the version and API info
include(${CORE_SOURCE_DIR}/cmake/scripts/common/Macros.cmake)
include(${CORE_SOURCE_DIR}/cmake/scripts/common/Platform.cmake)
core_find_versions()

# in case we need to download something, set KODI_MIRROR to the default if not already set
Expand Down

0 comments on commit e5a568e

Please sign in to comment.