Merge vk-gl-cts/vulkan-cts-1.2.8 into vk-gl-cts/vulkan-cts-1.3.0

[platform/upstream/VK-GL-CTS.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bfddef..6d940b3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -282,7 +282,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS ENTRY)
        if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
                # Executable target
                add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
-               target_link_libraries(${MODULE_NAME} tcutil-platform "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
+               target_link_libraries(${MODULE_NAME} PUBLIC tcutil-platform "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
                target_copy_files(${MODULE_NAME} platform-libs-${MODULE_NAME} "${DEQP_PLATFORM_COPY_LIBRARIES}")
        endif ()
 
@@ -331,6 +331,7 @@ add_subdirectory(external/openglcts)
 # Single-binary targets
 if (DE_OS_IS_ANDROID)
        include_directories(executor)
+       include_directories(${PROJECT_BINARY_DIR}/external/vulkancts/framework/vulkan)
 
        set(DEQP_SRCS
                framework/platform/android/tcuAndroidMain.cpp