From 6131cf2528d99b557b69ab00a9472fd184cc03e0 Mon Sep 17 00:00:00 2001 From: xantares Date: Thu, 17 Jun 2021 18:48:53 +0200 Subject: [PATCH] Loader shared lib: back to default cmake prefix but it changed the import lib name (libvulkan.dll.a instead of libvulkan-1.dll.a) which in turns breaks cmake detection in FindVulkan now we go back to using the default cmake prefix which is equivalent to what #595 wants, (prior to #523), but without the broken behavior cc @Biswa96 --- loader/CMakeLists.txt | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 89e70327..d56f948c 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -229,21 +229,14 @@ if(WIN32) $ ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-1.def ${CMAKE_CURRENT_SOURCE_DIR}/loader.rc) - if(MSVC) + + # when adding the suffix the import and runtime library names must be consistent + # mingw: libvulkan-1.dll.a / libvulkan-1.dll + # msvc: vulkan-1.lib / vulkan-1.dll set_target_properties(vulkan PROPERTIES - #LINK_FLAGS_DEBUG "/ignore:4098" - OUTPUT_NAME - vulkan-1 - PREFIX - "") - else() - set_target_properties(vulkan - PROPERTIES - LIBRARY_OUTPUT_NAME vulkan - RUNTIME_OUTPUT_NAME vulkan-1 - ARCHIVE_OUTPUT_NAME vulkan) - endif() + OUTPUT_NAME vulkan-1) + target_link_libraries(vulkan Vulkan::Headers) if(MSVC AND ENABLE_WIN10_ONECORE)