From c5a5d15fe3f518e48de91c8c9b5a4d8ea3aa48e5 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@curious-creature.com>
Date: Thu, 9 Apr 2020 08:49:51 -0700
Subject: [PATCH] Fix Vulkan linking with specific versions of CMake

---
 android/filament-android/CMakeLists.txt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/android/filament-android/CMakeLists.txt b/android/filament-android/CMakeLists.txt
index 8f5a6af566..b00e7f4527 100644
--- a/android/filament-android/CMakeLists.txt
+++ b/android/filament-android/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.6)
 
+option(FILAMENT_SUPPORTS_VULKAN "Enables Vulkan on Android" OFF)
+
 set(FILAMENT_DIR ${FILAMENT_DIST_DIR})
 
 add_library(filament STATIC IMPORTED)
@@ -88,6 +90,8 @@ target_link_libraries(filament-jni
     PRIVATE android
     PRIVATE jnigraphics
     PRIVATE utils
+    $<$<STREQUAL:${FILAMENT_SUPPORTS_VULKAN},ON>:bluevk>
+    $<$<STREQUAL:${FILAMENT_SUPPORTS_VULKAN},ON>:smol-v>
 )
 
 target_include_directories(filament-jni PRIVATE
@@ -98,9 +102,3 @@ target_include_directories(filament-jni PRIVATE
 
 # Force a relink when the version script is changed:
 set_target_properties(filament-jni PROPERTIES LINK_DEPENDS ${VERSION_SCRIPT})
-
-option(FILAMENT_SUPPORTS_VULKAN "Enables Vulkan on Android" OFF)
-
-if (FILAMENT_SUPPORTS_VULKAN)
-    target_link_libraries(filament-jni bluevk smol-v)
-endif()