Fixed CI for Android

GeniusVentures · Sep 26, 2024 · 4ea5a74 · 4ea5a74
1 parent 03c3f0e
commit 4ea5a74
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -7,7 +7,6 @@ jobs:
   build:
     env:
       GRPC_BUILD_ENABLE_CCACHE: "ON"
-      CMAKE_NO_VERBOSE: "ON"
     runs-on: ${{matrix.host}}
     strategy:
       fail-fast: false

diff --git a/build/Android/Boost-for-Android b/build/Android/Boost-for-Android
diff --git a/build/CommonTargets.CMake b/build/CommonTargets.CMake
@@ -371,6 +371,10 @@ if(NOT ANDROID AND NOT IOS)
         ${_CMAKE_COMMON_CACHE_ARGS}
         DEPENDS Vulkan-Headers
     )
+
+    set(ENV{VULKAN_SDK} "${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader")
+    set(vulkanTarget Vulkan-Loader)
+    message("VULKAN_SDK: ${$ENV{VULKAN_SDK}}")
 endif()
 
 # MNN
@@ -387,7 +391,7 @@ ExternalProject_Add(MNN
     -DMNN_WIN_RUNTIME_MT:BOOL=ON
     ${_CMAKE_COMMON_CACHE_ARGS}
     ${_MNN_EXTRA_PARAM}
-    DEPENDS ${_MNN_DEPENDS}
+    DEPENDS ${_MNN_DEPENDS} ${vulkanTarget}
 )
 
 set(_FINDPACKAGE_MNN_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/MNN/lib/cmake/mnn")