From c768fa91d0082ee44d4c8f428842e612c882909c Mon Sep 17 00:00:00 2001 From: xantares Date: Tue, 20 Oct 2020 19:51:16 +0200 Subject: [PATCH] Configure vulkan.pc when pkg-config is available This allows vulkan.pc to be enabled on MinGW --- loader/CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 7341403e..d86e25b2 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -311,20 +311,20 @@ else() if(NOT APPLE) target_compile_definitions(vulkan PRIVATE _XOPEN_SOURCE=500) # hush compiler warnings for readlink - - # Generate pkg-config file. - include(FindPkgConfig QUIET) - if(PKG_CONFIG_FOUND) - set(VK_API_VERSION "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}") - foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS}) - set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}") - endforeach() - configure_file("vulkan.pc.in" "vulkan.pc" @ONLY) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - endif() endif() endif() +# Generate pkg-config file. +include(FindPkgConfig QUIET) +if(PKG_CONFIG_FOUND) + set(VK_API_VERSION "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}") + foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS}) + set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}") + endforeach() + configure_file("vulkan.pc.in" "vulkan.pc" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +endif() + target_link_libraries(vulkan Vulkan::Headers) add_library(Vulkan::Vulkan ALIAS vulkan)