diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-27 02:07:08 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-27 02:14:24 +0300 |
commit | 7fa7c7ceda3df8d522b8f5a407a697987669033c (patch) | |
tree | 964320c8b6715a454a8e8877a0bd654f8899e36d | |
parent | 8da253cfb64fe578bd8136a7a0a4c4aa74fb536b (diff) |
Cleanup: remove redundant WITH_GHOST_WAYLAND check
-rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 109 |
1 files changed, 53 insertions, 56 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index f640f7f7650..d8940a3a267 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -727,78 +727,75 @@ if(WITH_GHOST_WAYLAND) set(WITH_GHOST_WAYLAND OFF) endif() - if(WITH_GHOST_WAYLAND) - if(WITH_GHOST_WAYLAND_DBUS) - pkg_check_modules(dbus REQUIRED dbus-1) - endif() + if(WITH_GHOST_WAYLAND_DBUS) + pkg_check_modules(dbus REQUIRED dbus-1) + endif() - if(WITH_GHOST_WAYLAND_LIBDECOR) - pkg_check_modules(libdecor REQUIRED libdecor-0>=0.1) - endif() + if(WITH_GHOST_WAYLAND_LIBDECOR) + pkg_check_modules(libdecor REQUIRED libdecor-0>=0.1) + endif() + list(APPEND PLATFORM_LINKLIBS + ${xkbcommon_LINK_LIBRARIES} + ) + + if(NOT WITH_GHOST_WAYLAND_DYNLOAD) list(APPEND PLATFORM_LINKLIBS - ${xkbcommon_LINK_LIBRARIES} + ${wayland-client_LINK_LIBRARIES} + ${wayland-egl_LINK_LIBRARIES} + ${wayland-cursor_LINK_LIBRARIES} ) + endif() - if(NOT WITH_GHOST_WAYLAND_DYNLOAD) - list(APPEND PLATFORM_LINKLIBS - ${wayland-client_LINK_LIBRARIES} - ${wayland-egl_LINK_LIBRARIES} - ${wayland-cursor_LINK_LIBRARIES} - ) - endif() + if(WITH_GHOST_WAYLAND_DBUS) + list(APPEND PLATFORM_LINKLIBS + ${dbus_LINK_LIBRARIES} + ) + add_definitions(-DWITH_GHOST_WAYLAND_DBUS) + endif() - if(WITH_GHOST_WAYLAND_DBUS) + if(WITH_GHOST_WAYLAND_LIBDECOR) + if(NOT WITH_GHOST_WAYLAND_DYNLOAD) list(APPEND PLATFORM_LINKLIBS - ${dbus_LINK_LIBRARIES} + ${libdecor_LIBRARIES} ) - add_definitions(-DWITH_GHOST_WAYLAND_DBUS) - endif() - - if(WITH_GHOST_WAYLAND_LIBDECOR) - if(NOT WITH_GHOST_WAYLAND_DYNLOAD) - list(APPEND PLATFORM_LINKLIBS - ${libdecor_LIBRARIES} - ) - endif() - add_definitions(-DWITH_GHOST_WAYLAND_LIBDECOR) endif() + add_definitions(-DWITH_GHOST_WAYLAND_LIBDECOR) + endif() - pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) + pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) - # When using dynamic loading, headers generated - # from older versions of `wayland-scanner` aren't compatible. - if(WITH_GHOST_WAYLAND_DYNLOAD) - execute_process( - COMMAND ${WAYLAND_SCANNER} --version - # The version is written to the `stderr`. - ERROR_VARIABLE _wayland_scanner_out - ERROR_STRIP_TRAILING_WHITESPACE + # When using dynamic loading, headers generated + # from older versions of `wayland-scanner` aren't compatible. + if(WITH_GHOST_WAYLAND_DYNLOAD) + execute_process( + COMMAND ${WAYLAND_SCANNER} --version + # The version is written to the `stderr`. + ERROR_VARIABLE _wayland_scanner_out + ERROR_STRIP_TRAILING_WHITESPACE + ) + if(NOT "${_wayland_scanner_out}" STREQUAL "") + string( + REGEX REPLACE + "^wayland-scanner[ \t]+([0-9]+)\.([0-9]+).*" + "\\1.\\2" + _wayland_scanner_ver + "${_wayland_scanner_out}" ) - if(NOT "${_wayland_scanner_out}" STREQUAL "") - string( - REGEX REPLACE - "^wayland-scanner[ \t]+([0-9]+)\.([0-9]+).*" - "\\1.\\2" - _wayland_scanner_ver - "${_wayland_scanner_out}" + if("${_wayland_scanner_ver}" VERSION_LESS "1.20") + message( + FATAL_ERROR + "Found ${WAYLAND_SCANNER} version \"${_wayland_scanner_ver}\", " + "the minimum version is 1.20!" ) - if("${_wayland_scanner_ver}" VERSION_LESS "1.20") - message( - FATAL_ERROR - "Found ${WAYLAND_SCANNER} version \"${_wayland_scanner_ver}\", " - "the minimum version is 1.20!" - ) - endif() - unset(_wayland_scanner_ver) - else() - message(WARNING "Unable to access the version from ${WAYLAND_SCANNER}, continuing.") endif() - unset(_wayland_scanner_out) + unset(_wayland_scanner_ver) + else() + message(WARNING "Unable to access the version from ${WAYLAND_SCANNER}, continuing.") endif() - # End wayland-scanner version check. - + unset(_wayland_scanner_out) endif() + # End wayland-scanner version check. endif() if(WITH_GHOST_X11) |