diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2020-10-05 20:35:58 -0700 |
|---|---|---|
| committer | Lukas Rusak <lorusak@gmail.com> | 2020-10-27 08:21:36 -0700 |
| commit | ac39df9be1b377eda1bf5b9e77ca9a1f547cf0c6 (patch) | |
| tree | 4fbdd02dabdedabcdba0646e8d16c27c7b79aa9a /cmake | |
| parent | 9d224f2952d611ac4787b826972f6e0434e956d8 (diff) | |
system/settings: merge x11.xml wayland.xml and gbm.xml into linux.xml
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/platform/linux/gbm.cmake | 2 | ||||
| -rw-r--r-- | cmake/platform/linux/wayland.cmake | 2 | ||||
| -rw-r--r-- | cmake/platform/linux/x11.cmake | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/cmake/platform/linux/gbm.cmake b/cmake/platform/linux/gbm.cmake index fa24fe400d..6d6192d1ca 100644 --- a/cmake/platform/linux/gbm.cmake +++ b/cmake/platform/linux/gbm.cmake @@ -12,5 +12,3 @@ elseif(GBM_RENDER_SYSTEM STREQUAL "gles") else() message(SEND_ERROR "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\".") endif() - -list(APPEND PLATFORM_DEFINES -DPLATFORM_SETTINGS_FILE=gbm.xml) diff --git a/cmake/platform/linux/wayland.cmake b/cmake/platform/linux/wayland.cmake index 7137c93ce7..9e16416f2b 100644 --- a/cmake/platform/linux/wayland.cmake +++ b/cmake/platform/linux/wayland.cmake @@ -15,6 +15,6 @@ endif() set(PLATFORM_GLOBAL_TARGET_DEPS generate-wayland-extra-protocols) set(WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}") -list(APPEND PLATFORM_DEFINES -DPLATFORM_SETTINGS_FILE=wayland.xml) + # for wayland-extra-protocols.hpp include_directories("${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}") diff --git a/cmake/platform/linux/x11.cmake b/cmake/platform/linux/x11.cmake index e3e6042596..4e19f8b3c6 100644 --- a/cmake/platform/linux/x11.cmake +++ b/cmake/platform/linux/x11.cmake @@ -13,5 +13,3 @@ elseif(X11_RENDER_SYSTEM STREQUAL "gles") else() message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering in combination with the X11 windowing system. Please set X11_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".") endif() - -list(APPEND PLATFORM_DEFINES -DPLATFORM_SETTINGS_FILE=x11.xml) |