From 9f02e9c4f027cb1ef692b79982f8abe7e8a4e9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 22 Dec 2017 00:00:54 +0100 Subject: [PATCH] Android cmake fix --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8915f868a..df8dbd2078 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,7 +84,7 @@ if(NOT ANDROID) endif() endif() -if(NOT WIN32 AND VULKAN) +if(VULKAN AND NOT WIN32 AND NOT ANDROID) IF (NOT Vulkan_FOUND) find_library(Vulkan_LIBRARY NAMES vulkan HINTS "$ENV{VULKAN_SDK}/lib" "${CMAKE_SOURCE_DIR}/ext/vulkan" REQUIRED) IF (Vulkan_LIBRARY) @@ -1676,7 +1676,7 @@ set(GlslangLibs glslang OGLCompiler OSDependent SPIRV SPVRemapper spirv-cross-gl target_link_libraries(${CoreLibName} Common native kirk cityhash sfmt19937 xbrz xxhash ${GlslangLibs} ${CoreExtraLibs} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${CMAKE_DL_LIBS}) -if(VULKAN) +if(VULKAN AND NOT ANDROID AND NOT WIN32) target_link_libraries(${CoreLibName} ${Vulkan_LIBRARY}) endif()