diff options
| author | Eleni Maria Stea <estea@igalia.com> | 2020-05-05 19:53:14 +0300 |
|---|---|---|
| committer | Eleni Maria Stea <estea@igalia.com> | 2020-05-06 04:25:32 +0300 |
| commit | 1ce683181a1d5bd2da143c545071806e1bc3d612 (patch) | |
| tree | 0924d5746ddd6bab1d671902ea977823836c407f | |
| parent | 09ac26b9021c7a883379384ff4afb5833aea6ed8 (diff) | |
ext_external_objects: make libvulkan dependency optional
Tests in ext_external_objects require Vulkan, but Vulkan may
not be available on Windows. Therefore, we made Vulkan optional
to avoid breaking the build on platforms other than Linux.
Signed-off-by: Eleni Maria Stea <estea@igalia.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/282>
| -rw-r--r-- | tests/spec/ext_external_objects/CMakeLists.gl.txt | 104 |
1 files changed, 55 insertions, 49 deletions
diff --git a/tests/spec/ext_external_objects/CMakeLists.gl.txt b/tests/spec/ext_external_objects/CMakeLists.gl.txt index 5cde9502b..1f4d3ed65 100644 --- a/tests/spec/ext_external_objects/CMakeLists.gl.txt +++ b/tests/spec/ext_external_objects/CMakeLists.gl.txt @@ -1,61 +1,67 @@ -find_program(GLSLANG_VALIDATOR NAMES glslangValidator) +link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} +) -set(VK_BANDS_VERT ${CMAKE_CURRENT_BINARY_DIR}/vk_bands.vert.spv) -set(VK_BANDS_FRAG ${CMAKE_CURRENT_BINARY_DIR}/vk_bands.frag.spv) +piglit_add_executable (ext_external_objects-memory-object-api-errors + memory-object-api-errors.c) +piglit_add_executable (ext_external_objects-semaphore-api-errors + semaphore-api-errors.c) -add_definitions(-DVK_BANDS_VERT="${VK_BANDS_VERT}") -add_definitions(-DVK_BANDS_FRAG="${VK_BANDS_FRAG}") +IF(LIBVULKAN_FOUND) + set(VK_BANDS_VERT ${CMAKE_CURRENT_BINARY_DIR}/vk_bands.vert.spv) + set(VK_BANDS_FRAG ${CMAKE_CURRENT_BINARY_DIR}/vk_bands.frag.spv) -IF(GLSLANG_VALIDATOR) - add_custom_command( - OUTPUT ${VK_BANDS_VERT} - COMMAND ${GLSLANG_VALIDATOR} -V ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.vert -o ${VK_BANDS_VERT} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.vert - ) + add_definitions(-DVK_BANDS_VERT="${VK_BANDS_VERT}") + add_definitions(-DVK_BANDS_FRAG="${VK_BANDS_FRAG}") - add_custom_command( - OUTPUT ${VK_BANDS_FRAG} - COMMAND ${GLSLANG_VALIDATOR} -V ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.frag -o ${VK_BANDS_FRAG} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.frag - ) -ELSE() - add_custom_command( - OUTPUT ${VK_BANDS_VERT} - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.vert.spv - ${VK_BANDS_VERT} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.vert - ) - - add_custom_command( - OUTPUT ${VK_BANDS_FRAG} - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.frag.spv - ${VK_BANDS_FRAG} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.frag - ) -ENDIF() + find_program(GLSLANG_VALIDATOR NAMES glslangValidator) -include_directories( - ${GLEXT_INCLUDE_DIR} - ${OPENGL_INCLUDE_PATH} -) + IF(GLSLANG_VALIDATOR) + add_custom_command( + OUTPUT ${VK_BANDS_VERT} + COMMAND ${GLSLANG_VALIDATOR} -V ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.vert -o ${VK_BANDS_VERT} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.vert + ) -link_libraries ( - piglitutil_${piglit_target_api} - ${OPENGL_gl_LIBRARY} - ${LIBVULKAN_LDFLAGS} -) + add_custom_command( + OUTPUT ${VK_BANDS_FRAG} + COMMAND ${GLSLANG_VALIDATOR} -V ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.frag -o ${VK_BANDS_FRAG} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.frag + ) + ELSE() + add_custom_command( + OUTPUT ${VK_BANDS_VERT} + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.vert.spv + ${VK_BANDS_VERT} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.vert + ) -piglit_add_executable (ext_external_objects-memory-object-api-errors memory-object-api-errors.c) + add_custom_command( + OUTPUT ${VK_BANDS_FRAG} + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.frag.spv + ${VK_BANDS_FRAG} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vk_bands.frag + ) + ENDIF() -piglit_add_executable (ext_external_objects-semaphore-api-errors semaphore-api-errors.c) + include_directories( + ${GLEXT_INCLUDE_DIR} + ${OPENGL_INCLUDE_PATH} + ) -piglit_add_executable (ext_external_objects-vk-image-override - vk.c interop.c vk_image_override.c) + link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} + ${LIBVULKAN_LDFLAGS} + ) -piglit_add_executable (ext_external_objects-vk-image-display - vk.c interop.c vk_image_display.c - ${VK_BANDS_VERT} ${VK_BANDS_FRAG}) + piglit_add_executable (ext_external_objects-vk-image-override + vk.c interop.c vk_image_override.c) + piglit_add_executable (ext_external_objects-vk-image-display + vk.c interop.c vk_image_display.c ${VK_BANDS_VERT} ${VK_BANDS_FRAG}) +ENDIF() # vim: ft=cmake: |