From 8c734ba0d2d99f3aaff8f7ea45587ac914780580 Mon Sep 17 00:00:00 2001 From: PENGUINLIONG Date: Mon, 8 Mar 2021 20:37:13 +0800 Subject: [PATCH 1/2] Prevent host Vulkan SDK blocking cross-compilation --- cmake/modules/Vulkan.cmake | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cmake/modules/Vulkan.cmake b/cmake/modules/Vulkan.cmake index 4df8986c800c..ceca595acc91 100644 --- a/cmake/modules/Vulkan.cmake +++ b/cmake/modules/Vulkan.cmake @@ -26,13 +26,8 @@ IF USE_VULKAN) tvm_option(USE_VULKAN_VALIDATION "Enable Vulkan API validation layers" OFF IF USE_VULKAN) -if(Vulkan_FOUND) - # always set the includedir - # avoid global retrigger of cmake - include_directories(SYSTEM ${Vulkan_INCLUDE_DIRS}) -endif(Vulkan_FOUND) - if(USE_VULKAN) + include_directories(SYSTEM ${Vulkan_INCLUDE_DIRS}) if(NOT Vulkan_FOUND) message(FATAL_ERROR "Cannot find Vulkan, USE_VULKAN=" ${USE_VULKAN}) endif() From d5e5ade2834dda8d254bdafa7df3da5df98bc3ae Mon Sep 17 00:00:00 2001 From: PENGUINLIONG Date: Mon, 8 Mar 2021 20:06:57 +0000 Subject: [PATCH 2/2] Relocate include statement --- cmake/modules/Vulkan.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/Vulkan.cmake b/cmake/modules/Vulkan.cmake index ceca595acc91..095790f08547 100644 --- a/cmake/modules/Vulkan.cmake +++ b/cmake/modules/Vulkan.cmake @@ -27,10 +27,10 @@ tvm_option(USE_VULKAN_VALIDATION "Enable Vulkan API validation layers" OFF IF USE_VULKAN) if(USE_VULKAN) - include_directories(SYSTEM ${Vulkan_INCLUDE_DIRS}) if(NOT Vulkan_FOUND) message(FATAL_ERROR "Cannot find Vulkan, USE_VULKAN=" ${USE_VULKAN}) endif() + include_directories(SYSTEM ${Vulkan_INCLUDE_DIRS}) message(STATUS "Build with Vulkan support") file(GLOB RUNTIME_VULKAN_SRCS src/runtime/vulkan/vulkan.cc) file(GLOB COMPILER_VULKAN_SRCS src/target/spirv/*.cc)