Andrew Geissler | c723b72 | 2021-01-08 16:14:09 -0600 | [diff] [blame] | 1 | From 5ae24ece75f2caa69216da7075334711642f5588 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michel Zou <xantares09@hotmail.com> |
| 3 | Date: Wed, 16 Dec 2020 15:03:23 +0100 |
| 4 | Subject: [PATCH] Rename LIB_SUFFIX to VULKAN_LIB_SUFFIX |
| 5 | |
| 6 | Closes #527 |
| 7 | |
| 8 | Upstream-Status: Backport [https://github.com/KhronosGroup/Vulkan-Loader/commit/66a23ac8c566299343668f094de50798a5f4a0e4] |
| 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 10 | --- |
| 11 | loader/CMakeLists.txt | 2 +- |
| 12 | loader/vulkan.pc.in | 2 +- |
| 13 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt |
| 16 | index 659511855..ba9f460f1 100644 |
| 17 | --- a/loader/CMakeLists.txt |
| 18 | +++ b/loader/CMakeLists.txt |
| 19 | @@ -327,7 +327,7 @@ if(PKG_CONFIG_FOUND) |
| 20 | set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}") |
| 21 | endforeach() |
| 22 | if(WIN32) |
| 23 | - set(LIB_SUFFIX "-1") |
| 24 | + set(VULKAN_LIB_SUFFIX "-1") |
| 25 | endif () |
| 26 | configure_file("vulkan.pc.in" "vulkan.pc" @ONLY) |
| 27 | install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") |
| 28 | diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in |
| 29 | index fc17cb1f3..44049ee34 100644 |
| 30 | --- a/loader/vulkan.pc.in |
| 31 | +++ b/loader/vulkan.pc.in |
| 32 | @@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ |
| 33 | Name: @CMAKE_PROJECT_NAME@ |
| 34 | Description: Vulkan Loader |
| 35 | Version: @VK_API_VERSION@ |
| 36 | -Libs: -L${libdir} -lvulkan@LIB_SUFFIX@ |
| 37 | +Libs: -L${libdir} -lvulkan@VULKAN_LIB_SUFFIX@ |
| 38 | Libs.private: @PRIVATE_LIBS@ |
| 39 | Cflags: -I${includedir} |
| 40 | |