From 3df7a11689a68ab76dd65c3dc1a0edb282e512c7 Mon Sep 17 00:00:00 2001 From: zlaazlaa <2889827787@qq.com> Date: Thu, 15 May 2025 15:35:30 +0800 Subject: [PATCH] Fix compile error in android Signed-off-by: zlaazlaa <2889827787@qq.com> --- CMakeLists.txt | 4 +++- src/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cfdec5e..6afd41aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,7 +135,9 @@ endif() # Has to happen AFTER using the build-in Vulkan headers to prevent multiple targets with the name Vulkan::Headers if(KOMPUTE_OPT_ANDROID_BUILD) add_library(vulkanAndroid INTERFACE) - set(VULKAN_INCLUDE_DIR ${ANDROID_NDK}/sources/third_party/vulkan/src/include) + if(NOT DEFINED VULKAN_INCLUDE_DIR) + message(FATAL_ERROR "VULKAN_INCLUDE_DIR is not set. Please set it to the Vulkan SDK include directory.") + endif() target_sources(vulkanAndroid INTERFACE ${VULKAN_INCLUDE_DIR}/vulkan/vulkan.hpp) target_include_directories(vulkanAndroid INTERFACE ${VULKAN_INCLUDE_DIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 36d01505..c4378600 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -82,7 +82,7 @@ if(KOMPUTE_OPT_BUILD_PYTHON) target_link_libraries(kompute PRIVATE pybind11::headers ${PYTHON_LIBRARIES}) endif() -if(KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER) +if(NOT KOMPUTE_OPT_ANDROID_BUILD AND KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER) target_link_libraries(kompute PUBLIC Vulkan-Headers) endif()