Fixing Android build - use builting vulkan header

GeniusVentures · Apr 19, 2023 · b90709b · b90709b
1 parent fcc5840
commit b90709b
Showing 1 changed file with 28 additions and 26 deletions.
diff --git a/build/CommonTargets.CMake b/build/CommonTargets.CMake
@@ -484,32 +484,34 @@ ExternalProject_Add(libsecp256k1
       ${_CMAKE_COMMON_BUILD_PARAMS}
 )
 
-# --------------------------------------------------------
-# Builds Vulkan-Headers
-ExternalProject_Add(Vulkan-Headers
-    PREFIX Vulkan-Headers
-    SOURCE_DIR "${THIRDPARTY_DIR}/Vulkan-Headers"
-    CMAKE_CACHE_ARGS
-      -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Headers
-      ${_CMAKE_COMMON_BUILD_PARAMS}
-)
-
-# --------------------------------------------------------
-# Builds Vulkan-Loader
-ExternalProject_Add(Vulkan-Loader
-    PREFIX Vulkan-Loader
-    SOURCE_DIR "${THIRDPARTY_DIR}/Vulkan-Loader"
-    CMAKE_CACHE_ARGS
-      -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader
-      -DVULKAN_HEADERS_INSTALL_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Headers
-      -DBUILD_WSI_WAYLAND_SUPPORT:BOOL=OFF
-      -DBUILD_WSI_XCB_SUPPORT:BOOL=OFF
-      -DBUILD_WSI_XLIB_SUPPORT:BOOL=OFF
-      -DUSE_GAS:BOOL=OFF
-      -DUPDATE_DEPS:BOOL=ON
-      ${_CMAKE_COMMON_BUILD_PARAMS}
-    DEPENDS Vulkan-Headers
-)
+if( NOT ANDROID) // # Use Android NDK builtin vulkan header
+  # --------------------------------------------------------
+  # Builds Vulkan-Headers
+  ExternalProject_Add(Vulkan-Headers
+      PREFIX Vulkan-Headers
+      SOURCE_DIR "${THIRDPARTY_DIR}/Vulkan-Headers"
+      CMAKE_CACHE_ARGS
+        -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Headers
+        ${_CMAKE_COMMON_BUILD_PARAMS}
+  )
+
+  # --------------------------------------------------------
+  # Builds Vulkan-Loader
+  ExternalProject_Add(Vulkan-Loader
+      PREFIX Vulkan-Loader
+      SOURCE_DIR "${THIRDPARTY_DIR}/Vulkan-Loader"
+      CMAKE_CACHE_ARGS
+        -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader
+        -DVULKAN_HEADERS_INSTALL_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Headers
+        -DBUILD_WSI_WAYLAND_SUPPORT:BOOL=OFF
+        -DBUILD_WSI_XCB_SUPPORT:BOOL=OFF
+        -DBUILD_WSI_XLIB_SUPPORT:BOOL=OFF
+        -DUSE_GAS:BOOL=OFF
+        -DUPDATE_DEPS:BOOL=ON
+        ${_CMAKE_COMMON_BUILD_PARAMS}
+      DEPENDS Vulkan-Headers
+  )
+endif()
 
 # --------------------------------------------------------
 # Builds kompute