Skip to content

refactor: drop unneeded WLR_VERSION macros #1444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepin-wm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: drop unneeded WLR_VERSION macros #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions waylib/src/server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if (NOT TARGET Wlroots::wlroots)
# Standalone Waylib build against an installed waylib-wlroots (built by
# the wlroots CMake scaffold, which also installs its headers and
# waylib-wlroots.pc). Resolve the library, its public dependencies and
# the wconfig.h version/feature metadata from that pkg-config file, so
# the wconfig.h feature metadata from that pkg-config file, so
# no monorepo layout is assumed.
find_package(PkgConfig REQUIRED)
pkg_check_modules(WLR_INSTALLED REQUIRED IMPORTED_TARGET waylib-wlroots)
Expand All @@ -39,9 +39,6 @@ if (NOT TARGET Wlroots::wlroots)
list(APPEND WAYLIB_WLROOTS_INCLUDE_DIRS "$<BUILD_INTERFACE:${_dir}>")
endforeach()
pkg_get_variable(WLROOTS_VERSION waylib-wlroots wlroots_version)
pkg_get_variable(WLR_VERSION_MAJOR waylib-wlroots wlroots_version_major)
pkg_get_variable(WLR_VERSION_MINOR waylib-wlroots wlroots_version_minor)
pkg_get_variable(WLR_VERSION_PATCH waylib-wlroots wlroots_version_patch)
pkg_get_variable(_waylib_wlroots_features waylib-wlroots wlroots_features)
foreach(_feature IN LISTS _waylib_wlroots_features)
set(WLR_HAVE_${_feature} 1)
Expand Down Expand Up @@ -418,8 +415,7 @@ set_target_properties(${TARGET}
POSITION_INDEPENDENT_CODE ON
)

# Forward wlroots feature/version vars
# exported by the wlroots CMake build.
# Sanity check: the wlroots CMake export must be present.
if(NOT DEFINED WLROOTS_VERSION)
message(FATAL_ERROR "WLROOTS_VERSION not set; wlroots CMake export missing")
endif()
Expand Down
5 changes: 0 additions & 5 deletions waylib/src/server/cmake/wconfig.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,3 @@
#cmakedefine WLR_HAVE_SESSION @WLR_HAVE_SESSION@
#cmakedefine WLR_HAVE_COLOR_MANAGEMENT @WLR_HAVE_COLOR_MANAGEMENT@
#cmakedefine WLR_HAVE_UDMABUF_ALLOCATOR @WLR_HAVE_UDMABUF_ALLOCATOR@

#define WLR_VERSION "@WLROOTS_VERSION@"
#define WLR_VERSION_MAJOR @WLROOTS_VERSION_MAJOR@
#define WLR_VERSION_MINOR @WLROOTS_VERSION_MINOR@
#define WLR_VERSION_PATCH @WLROOTS_VERSION_PATCH@
2 changes: 1 addition & 1 deletion waylib/src/server/kernel/wglobal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#define W_QC(Class) Q_Q(const Class)
#define W_PRIVATE_SLOT(Func) Q_PRIVATE_SLOT(d_func(), Func)

#if defined(WLR_HAVE_VULKAN_RENDERER) && QT_CONFIG(vulkan) && WLR_VERSION_MINOR > 16
#if defined(WLR_HAVE_VULKAN_RENDERER) && QT_CONFIG(vulkan)
#define ENABLE_VULKAN_RENDER
#endif

Expand Down
Loading