Skip to content

Commit

Permalink
Make building the Vulkan interop tests optional (KhronosGroup#1530)
Browse files Browse the repository at this point in the history
Allow enabling/disabling building of the Vulkan interop tests via CMake
option without modifying the CMake. This matches the optionality of the
D3D10, D3D11, GL, and GLES interop tests.
  • Loading branch information
kbenzie authored Oct 27, 2022
1 parent 90a5183 commit babed4c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ option(D3D10_IS_SUPPORTED "Run DirectX 10 interop tests" OFF)
option(D3D11_IS_SUPPORTED "Run DirectX 11 interop tests" OFF)
option(GL_IS_SUPPORTED "Run OpenGL interop tests" OFF)
option(GLES_IS_SUPPORTED "Run OpenGL ES interop tests" OFF)
option(VULKAN_IS_SUPPORTED "Run Vulkan interop tests" OFF)


#-----------------------------------------------------------
Expand Down
4 changes: 3 additions & 1 deletion test_conformance/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ add_subdirectory( pipes )
add_subdirectory( device_timer )
add_subdirectory( spirv_new )
add_subdirectory( spir )
add_subdirectory( vulkan )
if(VULKAN_IS_SUPPORTED)
add_subdirectory( vulkan )
endif()

file(GLOB CSV_FILES "opencl_conformance_tests_*.csv")

Expand Down

0 comments on commit babed4c

Please sign in to comment.