From 3e0676d07bb1afe4b954509080d013252b722a52 Mon Sep 17 00:00:00 2001 From: Fred Emmott <360927+fredemmott@users.noreply.github.com> Date: Tue, 26 Nov 2024 08:29:38 -0600 Subject: [PATCH 1/2] Install `XrApiLayer_conformance_test_layer.json` This is missing from at least the Openxr-cts-x64 bundle, and appears to not be installed by CMake Taken the same approach as https://github.com/KhronosGroup/OpenXR-CTS/blob/devel/src/conformance/conformance_layer/CMakeLists.txt Without this, `validApiLayer` fails on all runtimes when using a prebuild CTS bundle. --- src/conformance/conformance_test/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/conformance/conformance_test/CMakeLists.txt b/src/conformance/conformance_test/CMakeLists.txt index adeb4a8..cbc07b7 100644 --- a/src/conformance/conformance_test/CMakeLists.txt +++ b/src/conformance/conformance_test/CMakeLists.txt @@ -238,6 +238,11 @@ set_target_properties( conformance_test PROPERTIES FOLDER ${CONFORMANCE_TESTS_FOLDER} ) +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/XrApiLayer_conformance_test_layer.json + DESTINATION conformance +) + install( TARGETS conformance_test LIBRARY DESTINATION conformance From 443e41d341c81d7c9096b67cb8063d040f32a975 Mon Sep 17 00:00:00 2001 From: Fred Emmott Date: Tue, 26 Nov 2024 10:04:45 -0600 Subject: [PATCH 2/2] add changelog fragment --- changes/conformance/pr.100.gh.OpenXR-CTS.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/conformance/pr.100.gh.OpenXR-CTS.md diff --git a/changes/conformance/pr.100.gh.OpenXR-CTS.md b/changes/conformance/pr.100.gh.OpenXR-CTS.md new file mode 100644 index 0000000..4ae0d93 --- /dev/null +++ b/changes/conformance/pr.100.gh.OpenXR-CTS.md @@ -0,0 +1 @@ +Fix: Install manifest for conformance test layer