X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=external%2Fvulkancts%2Fmodules%2Fvulkan%2Fsynchronization%2FCMakeLists.txt;h=fd15964568f474ea4be9cb8584823f77371d72c0;hb=4448e3ace38cfe427131e660aea81d91a5beead6;hp=440d413e20e5b1d72cc50543e5ac221a1ecbb89d;hpb=06e78782c6d4d0859260088eea8f969ab4a9df44;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 440d413..fd15964 100644
--- a/external/vulkancts/modules/vulkan/synchronization/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/synchronization/CMakeLists.txt
@@ -1,9 +1,10 @@
 include_directories(
 	..
 	../util
+	${DEQP_INL_DIR}
 	)
 
-set(DEQP_VK_SYNCHRONIZATION_SRCS
+set(DEQP_VK_VKSC_SYNCHRONIZATION_SRCS
 	vktSynchronizationTests.cpp
 	vktSynchronizationTests.hpp
 	vktSynchronizationUtil.cpp
@@ -25,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
@@ -37,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)