X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=external%2Fvulkancts%2Fmodules%2Fvulkan%2Fsynchronization%2FCMakeLists.txt;h=fd15964568f474ea4be9cb8584823f77371d72c0;hb=4448e3ace38cfe427131e660aea81d91a5beead6;hp=930caba6ba085bc0d3fca63410b48fee9b4dd830;hpb=2fe133e2f5a1c8112273b899fd03a59b9c6c6a8e;p=platform%2Fupstream%2FVK-GL-CTS.git diff --git a/external/vulkancts/modules/vulkan/synchronization/CMakeLists.txt b/external/vulkancts/modules/vulkan/synchronization/CMakeLists.txt index 930caba..fd15964 100644 --- a/external/vulkancts/modules/vulkan/synchronization/CMakeLists.txt +++ b/external/vulkancts/modules/vulkan/synchronization/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories( ${DEQP_INL_DIR} ) -set(DEQP_VK_SYNCHRONIZATION_SRCS +set(DEQP_VK_VKSC_SYNCHRONIZATION_SRCS vktSynchronizationTests.cpp vktSynchronizationTests.hpp vktSynchronizationUtil.cpp @@ -26,10 +26,15 @@ set(DEQP_VK_SYNCHRONIZATION_SRCS vktSynchronizationInternallySynchronizedObjectsTests.cpp vktSynchronizationInternallySynchronizedObjectsTests.hpp vktSynchronizationOperationTestData.hpp - vktSynchronizationCrossInstanceSharingTests.cpp - vktSynchronizationCrossInstanceSharingTests.hpp vktSynchronizationTimelineSemaphoreTests.cpp vktSynchronizationTimelineSemaphoreTests.hpp + vktSynchronizationImageLayoutTransitionTests.cpp + vktSynchronizationImageLayoutTransitionTests.cpp + ) + +set(DEQP_VK_SYNCHRONIZATION_SRCS + vktSynchronizationCrossInstanceSharingTests.cpp + vktSynchronizationCrossInstanceSharingTests.hpp vktSynchronizationNoneStageTests.cpp vktSynchronizationNoneStageTests.hpp vktSynchronizationSignalOrderTests.cpp @@ -38,12 +43,11 @@ set(DEQP_VK_SYNCHRONIZATION_SRCS vktSynchronizationWin32KeyedMutexTests.hpp ) -set(DEQP_VK_SYNCHRONIZATION_LIBS - tcutil - vkutil - ) - PCH(DEQP_VK_SYNCHRONIZATION_SRCS ../pch.cpp) -add_library(deqp-vk-synchronization STATIC ${DEQP_VK_SYNCHRONIZATION_SRCS}) -target_link_libraries(deqp-vk-synchronization ${DEQP_VK_SYNCHRONIZATION_LIBS}) +add_library(deqp-vk-synchronization STATIC ${DEQP_VK_VKSC_SYNCHRONIZATION_SRCS} ${DEQP_VK_SYNCHRONIZATION_SRCS}) +target_link_libraries(deqp-vk-synchronization tcutil vkutil) + +add_library(deqp-vksc-synchronization STATIC ${DEQP_VK_VKSC_SYNCHRONIZATION_SRCS}) +target_include_directories(deqp-vksc-synchronization BEFORE PUBLIC ${CMAKE_SOURCE_DIR}/external/vulkancts/framework/vulkan/generated/vulkansc) +target_link_libraries(deqp-vksc-synchronization PUBLIC deqp-vksc-util tcutil vkscutil)