From b6fb3be907c34d2cea4b006d89a13e32491c366d Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Mon, 5 Dec 2016 21:41:14 +0100 Subject: [PATCH] Make sure Vulkan is fully disabled where not available. --- CMakeLists.txt | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c52057a39c..c81809a5d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -295,17 +295,21 @@ set(CommonWindows Common/stdafx.h) source_group(Windows FILES ${CommonWindows}) -set(CommonVulkan ${CommonExtra} - Common/Vulkan/SPIRVDisasm.cpp - Common/Vulkan/SPIRVDisasm.h - Common/Vulkan/VulkanContext.cpp - Common/Vulkan/VulkanContext.h - Common/Vulkan/VulkanImage.cpp - Common/Vulkan/VulkanImage.h - Common/Vulkan/VulkanLoader.cpp - Common/Vulkan/VulkanLoader.h - Common/Vulkan/VulkanMemory.cpp - Common/Vulkan/VulkanMemory.h) +if(VULKAN) + set(CommonVulkan ${CommonExtra} + Common/Vulkan/SPIRVDisasm.cpp + Common/Vulkan/SPIRVDisasm.h + Common/Vulkan/VulkanContext.cpp + Common/Vulkan/VulkanContext.h + Common/Vulkan/VulkanImage.cpp + Common/Vulkan/VulkanImage.h + Common/Vulkan/VulkanLoader.cpp + Common/Vulkan/VulkanLoader.h + Common/Vulkan/VulkanMemory.cpp + Common/Vulkan/VulkanMemory.h) +else() + set(CommonVulkan) +endif() add_library(Common STATIC ${CommonX86}