9 files changed, 11 insertions, 1 deletions
diff --git a/cmake/KodiConfig.cmake.in b/cmake/KodiConfig.cmake.in
index 58dfc40efa..2a572e797f 100644
--- a/cmake/KodiConfig.cmake.in
+++ b/cmake/KodiConfig.cmake.in
@@ -16,6 +16,7 @@ endif()
 if(NOT @APP_NAME_UC@_DATA_DIR)
   set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@)
 endif()
+set(APP_RENDER_SYSTEM @APP_RENDER_SYSTEM@)
 if(NOT WIN32)
   set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
 endif()
diff --git a/cmake/platform/linux/aml.cmake b/cmake/platform/linux/aml.cmake
index c1d464d2d2..3b2fe76277 100644
--- a/cmake/platform/linux/aml.cmake
+++ b/cmake/platform/linux/aml.cmake
@@ -1 +1,2 @@
 set(PLATFORM_REQUIRED_DEPS OpenGLES AML EGL)
+set(APP_RENDER_SYSTEM gles)
diff --git a/cmake/platform/linux/gbm.cmake b/cmake/platform/linux/gbm.cmake
index 6a9165aaff..5f5cb8312c 100644
--- a/cmake/platform/linux/gbm.cmake
+++ b/cmake/platform/linux/gbm.cmake
@@ -1,2 +1,3 @@
 set(PLATFORM_REQUIRED_DEPS OpenGLES EGL GBM LibDRM)
 set(PLATFORM_OPTIONAL_DEPS VAAPI)
+set(APP_RENDER_SYSTEM gles)
diff --git a/cmake/platform/linux/mir.cmake b/cmake/platform/linux/mir.cmake
index 7f20da83f5..0e672a9b16 100644
--- a/cmake/platform/linux/mir.cmake
+++ b/cmake/platform/linux/mir.cmake
@@ -1,2 +1,3 @@
 set(PLATFORM_REQUIRED_DEPS OpenGl EGL Mir LibDRM)
 set(PLATFORM_OPTIONAL_DEPS VAAPI OpenGLES)
+set(APP_RENDER_SYSTEM gl)
diff --git a/cmake/platform/linux/rbpi.cmake b/cmake/platform/linux/rbpi.cmake
index 4899857d4b..5dd3409c6a 100644
--- a/cmake/platform/linux/rbpi.cmake
+++ b/cmake/platform/linux/rbpi.cmake
@@ -1 +1,2 @@
 set(PLATFORM_REQUIRED_DEPS OpenGLES EGL MMAL)
+set(APP_RENDER_SYSTEM gles)
diff --git a/cmake/platform/linux/wayland.cmake b/cmake/platform/linux/wayland.cmake
index 39348346b0..1a7e219989 100644
--- a/cmake/platform/linux/wayland.cmake
+++ b/cmake/platform/linux/wayland.cmake
@@ -5,8 +5,10 @@ set(WAYLAND_RENDER_SYSTEM "" CACHE STRING "Render system to use with Wayland: \"
 
 if(WAYLAND_RENDER_SYSTEM STREQUAL "gl")
   list(APPEND PLATFORM_REQUIRED_DEPS OpenGl)
+  set(APP_RENDER_SYSTEM gl)
 elseif(WAYLAND_RENDER_SYSTEM STREQUAL "gles")
   list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES)
+  set(APP_RENDER_SYSTEM gles)
 else()
   message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering in combination with the Wayland windowing system. Please set WAYLAND_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".")
 endif()
@@ -14,4 +16,4 @@ endif()
 set(PLATFORM_GLOBAL_TARGET_DEPS generate-wayland-extra-protocols)
 set(WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 # for wayland-extra-protocols.hpp
-include_directories("${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}")
-\ No newline at end of file
+include_directories("${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}")
diff --git a/cmake/platform/linux/x11.cmake b/cmake/platform/linux/x11.cmake
index 656fd66572..09cebde3db 100644
--- a/cmake/platform/linux/x11.cmake
+++ b/cmake/platform/linux/x11.cmake
@@ -1,2 +1,3 @@
 set(PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM)
 set(PLATFORM_OPTIONAL_DEPS VAAPI VDPAU GLX)
+set(APP_RENDER_SYSTEM gl)
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake
index 8e4f61defd..57f2390f7c 100644
--- a/cmake/scripts/windows/ArchSetup.cmake
+++ b/cmake/scripts/windows/ArchSetup.cmake
@@ -12,6 +12,7 @@ endif()
 # -------- Paths (mainly for find_package) ---------
 
 set(PLATFORM_DIR platform/win32)
+set(APP_RENDER_SYSTEM dx11)
 
 set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/win32/WinMain.cpp)
 
diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake
index 6c6622cb1b..b30463da43 100644
--- a/cmake/scripts/windowsstore/ArchSetup.cmake
+++ b/cmake/scripts/windowsstore/ArchSetup.cmake
@@ -24,6 +24,7 @@ unset(_ARM_)
 # -------- Paths (mainly for find_package) ---------
 
 set(PLATFORM_DIR platform/win32)
+set(APP_RENDER_SYSTEM dx11)
 set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/win10/main.cpp)
 
 # Precompiled headers fail with per target output directory. (needs CMake 3.1)