diff options
| author | Campbell Barton <campbell@blender.org> | 2022-10-07 23:46:59 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-10-08 00:00:04 +0300 |
| commit | b083755c20f33fd8461c71d20e6c7bcce9411b1a (patch) | |
| tree | d18532a10ae91ccc721ba7634089ef42dcfb6266 /build_files | |
| parent | f63179cc9fef42cc4f8b126d92b08f8b0d07dd87 (diff) | |
Deps: harvest Wayland headers, build Wayland libraries
The headers on centOS7 (Wayland 1.15) aren't compatible with the headers
generated by wayland-scanner 1.20.
Include the headers to support building Wayland on systems with
older Wayland installed.
Using these headers will be part of a separate commit.
Part of D16091.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 1 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/wayland.cmake | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index 6c920e651fe..85e1dcab3fd 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -118,6 +118,7 @@ else() harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml") harvest(wayland/bin wayland/bin "wayland-scanner") + harvest(wayland/include wayland/include "*.h") else() harvest(blosc/lib openvdb/lib "*.a") harvest(xml2/lib opencollada/lib "*.a") diff --git a/build_files/build_environment/cmake/wayland.cmake b/build_files/build_environment/cmake/wayland.cmake index 29859cc9ba5..799f2513da9 100644 --- a/build_files/build_environment/cmake/wayland.cmake +++ b/build_files/build_environment/cmake/wayland.cmake @@ -6,9 +6,11 @@ ExternalProject_Add(external_wayland URL_HASH ${WAYLAND_HASH_TYPE}=${WAYLAND_HASH} PREFIX ${BUILD_DIR}/wayland PATCH_COMMAND ${PATCH_CMD} -d ${BUILD_DIR}/wayland/src/external_wayland < ${PATCH_DIR}/wayland.diff - # Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own LIBEXPAT. - CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/expat/lib/pkgconfig:${LIBDIR}/xml2/lib/pkgconfig:$PKG_CONFIG_PATH - meson --prefix ${LIBDIR}/wayland -Ddocumentation=false -Dtests=false -Dlibraries=false . ../external_wayland + # Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own LIBEXPAT & LIBXML2. + # Note that passing link args "ffi/lib" should not be needed, but + # `pkgconfig` would incorrectly look in "ffi/lib/../lib64" otherwise. + CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/expat/lib/pkgconfig:${LIBDIR}/xml2/lib/pkgconfig:${LIBDIR}/ffi/lib/pkgconfig:$PKG_CONFIG_PATH + meson --prefix ${LIBDIR}/wayland -Ddocumentation=false -Dtests=false -Dc_link_args=-L${LIBDIR}/ffi/lib . ../external_wayland BUILD_COMMAND ninja INSTALL_COMMAND ninja install ) @@ -17,4 +19,5 @@ add_dependencies( external_wayland external_expat external_xml2 + external_ffi ) |