Make it more clear that wayland is unsupported at build time. Refs #3124

This commit is contained in:
baldurk
2023-11-13 11:33:05 +00:00
parent 4a1d1896b7
commit f2c1435a7d
4 changed files with 8 additions and 8 deletions
+5 -5
View File
@@ -207,7 +207,7 @@ option(ENABLE_PYRENDERDOC "Enable renderdoc python modules" ON)
option(ENABLE_XLIB "Enable xlib windowing support" ON)
option(ENABLE_XCB "Enable xcb windowing support" ON)
option(ENABLE_WAYLAND "Enable experimental wayland windowing support" OFF)
option(ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND "Enable EXPERIMENTAL, POSSIBLY BROKEN, UNSUPPORTED wayland windowing support" OFF)
option(ENABLE_GGP "Enable GGP support" OFF)
option(ENABLE_ASAN "Enable address sanitizer" OFF)
@@ -230,7 +230,7 @@ if(ENABLE_TSAN)
message(STATUS "Enabling thread sanitizer - may cause issues if capturing, only recommended for use with replay only")
endif()
if(ENABLE_WAYLAND)
if(ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND)
find_package(PkgConfig REQUIRED)
pkg_check_modules(PKG_WAYLAND QUIET wayland-client)
@@ -241,7 +241,7 @@ if(ENABLE_WAYLAND)
endif()
else()
message(WARNING "Wayland not found - disabling support")
set(ENABLE_WAYLAND OFF CACHE BOOL "" FORCE)
set(ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND OFF CACHE BOOL "" FORCE)
endif()
endif()
@@ -468,7 +468,7 @@ elseif(UNIX)
add_definitions(-DRENDERDOC_WINDOWING_XCB)
endif()
if(ENABLE_WAYLAND)
if(ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND)
add_definitions(-DRENDERDOC_WINDOWING_WAYLAND)
endif()
endif()
@@ -543,7 +543,7 @@ if(UNIX AND NOT ANDROID AND NOT APPLE AND NOT ENABLE_GGP)
message(STATUS " - XCB")
endif()
if(ENABLE_WAYLAND)
if(ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND)
message(STATUS " - Wayland")
endif()
endif()
+1 -1
View File
@@ -227,7 +227,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_
"QMAKE_CXXFLAGS+=-Wno-comma\n")
endif()
if(ENABLE_WAYLAND)
if(ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND)
message(WARNING "!!!! Using the Wayland Qt platform in qrenderdoc is NOT SUPPORTED !!!!")
file(APPEND
${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri
+1 -1
View File
@@ -91,7 +91,7 @@ elseif(UNIX)
PRIVATE -l${XCB_LIBRARIES})
endif()
if(ENABLE_WAYLAND)
if(ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND)
pkg_check_modules(PKG_WAYLAND QUIET wayland-client)
list(APPEND RDOC_INCLUDES
+1 -1
View File
@@ -120,7 +120,7 @@ elseif(UNIX)
add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
endif()
if(ENABLE_WAYLAND)
if(ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND)
add_definitions(-DVK_USE_PLATFORM_WAYLAND_KHR)
endif()