Merge vk-gl-cts/opengl-cts-4.6.0 into vk-gl-cts/master

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / CMakeLists.txt

diff --git a/external/vulkancts/modules/vulkan/CMakeLists.txt b/external/vulkancts/modules/vulkan/CMakeLists.txt
index 24f2291..8dd4224 100644 (file)
--- a/external/vulkancts/modules/vulkan/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/CMakeLists.txt
@@ -23,7 +23,9 @@ add_subdirectory(clipping)
 add_subdirectory(fragment_ops)
 add_subdirectory(geometry)
 add_subdirectory(texture)
+add_subdirectory(robustness)
 add_subdirectory(renderpass)
+add_subdirectory(ycbcr)
 
 include_directories(
        api
@@ -49,10 +51,12 @@ include_directories(
        fragment_ops
        texture
        geometry
+       robustness
        renderpass
+       ycbcr
        )
 
-set(DEQP_VK_COMMON_SRCS
+set(DEQP_VK_SRCS
        vktTestCase.cpp
        vktTestCase.hpp
        vktTestCaseUtil.cpp
@@ -65,11 +69,15 @@ set(DEQP_VK_COMMON_SRCS
        vktTestGroupUtil.hpp
        vktInfoTests.cpp
        vktInfoTests.hpp
+       vktDrawUtil.cpp
+       vktDrawUtil.hpp
        vktExternalMemoryUtil.cpp
        vktExternalMemoryUtil.hpp
+       vktDrawUtil.cpp
+       vktDrawUtil.hpp
        )
 
-set(DEQP_VK_COMMON_LIBS
+set(DEQP_VK_LIBS
        tcutil
        vkutil
        glutil
@@ -96,21 +104,11 @@ set(DEQP_VK_COMMON_LIBS
        deqp-vk-fragment-ops
        deqp-vk-texture
        deqp-vk-geometry
+       deqp-vk-robustness
        deqp-vk-render-pass
+       deqp-vk-ycbcr
        )
 
-add_library(deqp-vk-common STATIC ${DEQP_VK_COMMON_SRCS})
-target_link_libraries(deqp-vk-common ${DEQP_VK_COMMON_LIBS})
-add_dependencies(deqp-vk-common deqp-vk-data)
-
-set(DEQP_VK_SRCS       )
-set(DEQP_VK_LIBS       deqp-vk-common)
-
-if (DE_OS_IS_WIN32 OR DE_OS_IS_UNIX OR DE_OS_IS_OSX)
-       add_executable(vk-build-programs vktBuildPrograms.cpp)
-       target_link_libraries(vk-build-programs deqp-vk-common)
-endif ()
-
 if (DE_COMPILER_IS_MSC AND (DE_PTR_SIZE EQUAL 4))
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
 endif ()
@@ -118,3 +116,8 @@ endif ()
 add_deqp_module(deqp-vk "${DEQP_VK_SRCS}" "${DEQP_VK_LIBS}" vktTestPackageEntry.cpp)
 
 add_data_dir(deqp-vk ../../data/vulkan vulkan)
+
+if (DE_OS_IS_WIN32 OR DE_OS_IS_UNIX OR DE_OS_IS_OSX)
+       add_executable(vk-build-programs vktBuildPrograms.cpp)
+       target_link_libraries(vk-build-programs deqp-vk${MODULE_LIB_TARGET_POSTFIX})
+endif ()