vulkan-validation-layers: cleanup recipe
PATCH 1/1 vulkan-validation-layers: cleanup recipe
Commit doesn't change build behavior hopefully allows cmake to find required .cmake files faster.
* Removes ${libdir} from FILES:${PN} as its not required.
* Updates PACKAGECONFIG to uses just one @bb.utils.filter call.
* Updates GLSLANG_INSTALL_DIR to <recipe-sysroot>/lib${64} as that contains the actual directory of the glslang .cmake config files.
* VULKAN_HEADERS_INSTALL_DIR and SPIRV_HEADERS_INSTALL_DIR are updated to <recipe-sysroot>/usr/share from <recipe-sysroot>/usr. According to cmake
"Config Mode Search Procedure" the choosen directory would be the second entry list of directories to search when looking for .cmake files after first looking into CMAKE_FIND_PACKAGE_REDIRECTS_DIR directory.
--- .../vulkan/vulkan-validation-layers_1.3.243.0.bb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb +5 -8
@@ -23,22 +23,19 @@ DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang" EXTRA_OECMAKE = "\ -DBUILD_TESTS=OFF \ -DUSE_ROBIN_HOOD_HASHING=OFF \ - -DGLSLANG_INSTALL_DIR=${STAGING_DATADIR} \ - -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ - -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ + -DGLSLANG_INSTALL_DIR=${STAGING_LIBDIR} \ + -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_DATADIR} \ + -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_DATADIR} \ " PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" -PACKAGECONFIG ?= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ - " +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" inherit cmake features_check pkgconfig -FILES:${PN} += "${datadir}/vulkan ${libdir}" +FILES:${PN} += "${datadir}/vulkan" SOLIBS = ".so" FILES_SOLIBSDEV = ""
Signature · 1 line
2.34.1
Sorry, Guys want to cancel this MR. Thought I saw the VulkanHeadersConfig.cmake be located in <recipes-sysroot>/usr/share/cmake when testing on other platforms and different distro features. Changes to VULKAN_HEADERS_INSTALL_DIR fail in certain configurations.