mirror of
https://github.com/openharmony/third_party_vulkan-loader.git
synced 2026-07-20 01:25:05 -04:00
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
This commit is contained in:
committed by
Charles Giessen
parent
76b10a878e
commit
6131cf2528
+6
-13
@@ -229,21 +229,14 @@ if(WIN32)
|
||||
$<TARGET_OBJECTS:loader-unknown-chain>
|
||||
${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)
|
||||
|
||||
Reference in New Issue
Block a user