diff options
| author | Campbell Barton <campbell@blender.org> | 2022-10-14 10:59:11 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-10-14 10:59:11 +0300 |
| commit | b2ab9977bf3b3e109ac976045635d84b9ae7f3c6 (patch) | |
| tree | 7c5894eb12408e777327cf86264f90750f0fe05b /build_files | |
| parent | 695614ad3b7afb95b9918081d9e2c8e1ddd87f5e (diff) | |
Deps: use the locally built wayland-scanner for wayland_protocols
This removes the dependency on wayland-devel, with some potential
for errors caused from using two different versions.
Note that the generated files are currently unchanged.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/wayland_protocols.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/wayland_protocols.cmake b/build_files/build_environment/cmake/wayland_protocols.cmake index 23d29b49260..9bdbc38fd6c 100644 --- a/build_files/build_environment/cmake/wayland_protocols.cmake +++ b/build_files/build_environment/cmake/wayland_protocols.cmake @@ -5,7 +5,14 @@ ExternalProject_Add(external_wayland_protocols DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH ${WL_PROTOCOLS_HASH_TYPE}=${WL_PROTOCOLS_HASH} PREFIX ${BUILD_DIR}/wayland-protocols - CONFIGURE_COMMAND meson --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false + # Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own WAYLAND. + CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/wayland/lib64/pkgconfig:$PKG_CONFIG_PATH + meson --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false BUILD_COMMAND ninja INSTALL_COMMAND ninja install ) + +add_dependencies( + external_wayland_protocols + external_wayland +) |