diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-03-29 15:25:29 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-03-29 15:25:29 +0200 |
| commit | 64ac7b47b81549bce8911422209c81b77a9232ba (patch) | |
| tree | 7cba1a59a6484779bd1e3356fd95546b81cca40b | |
| parent | 70252b0c1a80e580eb81d9212274a273b19868c4 (diff) | |
Improve detection of the location of Wayland protocol files across OSes
| -rw-r--r-- | libdecor/build/Makefile | 7 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 7 |
2 files changed, 3 insertions, 11 deletions
diff --git a/libdecor/build/Makefile b/libdecor/build/Makefile index f25f84168..98d8b0bef 100644 --- a/libdecor/build/Makefile +++ b/libdecor/build/Makefile @@ -20,12 +20,7 @@ OBJECTS = fl_libdecor.o libdecor-cairo-blur.o fl_libdecor-plugins.o \ ../../src/xdg-decoration-protocol.o ../../src/xdg-shell-protocol.o \ ../../src/text-input-protocol.o cursor-settings.o os-compatibility.o - -# ${UNAME} is set to the product of `uname -s` in makeinclude - -Linux_PROTO = /usr/share/wayland-protocols -FreeBSD_PROTO = /usr/local/share/wayland-protocols -PROTOCOLS = ${${UNAME}_PROTO} +PROTOCOLS = `pkg-config --variable=pkgdatadir wayland-protocols` Linux_CFLAGS = FreeBSD_CFLAGS = -I/usr/local/include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 02a6dbd81..920488e89 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -644,11 +644,8 @@ if (UNIX AND OPTION_USE_WAYLAND) if (NOT (CMAKE_VERSION VERSION_LESS 3.4)) pkg_get_variable(PROTOCOLS wayland-protocols pkgdatadir) # requires cmake 3.4 else() - if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "FreeBSD") - set(PROTOCOLS /usr/local/share/wayland-protocols) - else () - set(PROTOCOLS /usr/share/wayland-protocols) - endif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "FreeBSD") + execute_process(COMMAND pkg-config --variable=pkgdatadir wayland-protocols + OUTPUT_VARIABLE PROTOCOLS) endif (NOT (CMAKE_VERSION VERSION_LESS 3.4)) if (NOT(EXISTS ${PROTOCOLS}/stable/xdg-shell/xdg-shell.xml)) message(WARNING "Install necessary file ${PROTOCOLS}/stable/xdg-shell/xdg-shell.xml") |