X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=external%2Fvulkancts%2Fmodules%2Fvulkan%2Fsynchronization%2FCMakeLists.txt;h=460e4284488d143c1535495034a978002572a074;hb=5aa5b0809f055f36fc384644925c384596b2f7cd;hp=ae71d1cee6eab119ba25a45ed9f37b7ee9f3172c;hpb=b3f0a1abf454720f312dcb0877d93af5e7ef1958;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 ae71d1c..460e428 100644 --- a/external/vulkancts/modules/vulkan/synchronization/CMakeLists.txt +++ b/external/vulkancts/modules/vulkan/synchronization/CMakeLists.txt @@ -4,7 +4,8 @@ include_directories( ${DEQP_INL_DIR} ) -set(DEQP_VK_SYNCHRONIZATION_SRCS +set(DEQP_VK_VKSC_SYNCHRONIZATION_SRCS + vktSynchronizationDefs.hpp vktSynchronizationTests.cpp vktSynchronizationTests.hpp vktSynchronizationUtil.cpp @@ -26,26 +27,32 @@ 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 vktSynchronizationSignalOrderTests.hpp vktSynchronizationWin32KeyedMutexTests.cpp vktSynchronizationWin32KeyedMutexTests.hpp - vktSynchronizationImageLayoutTransitionTests.cpp - vktSynchronizationImageLayoutTransitionTests.cpp - ) - -set(DEQP_VK_SYNCHRONIZATION_LIBS - tcutil - vkutil + vktGlobalPriorityQueueTests.cpp + vktGlobalPriorityQueueTests.hpp + vktGlobalPriorityQueueUtils.cpp + vktGlobalPriorityQueueUtils.hpp ) 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)