From: Juan Ramos <juan@lunarg.com>
Date: Wed, 4 Oct 2023 21:15:35 +0000 (-0600)
Subject: cmake: Remove PRIVATE_LIBS from vulkan.pc.in
X-Git-Tag: upstream/1.3.268~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2774718bb8276e75cd0c132454b13b0c11a4600;p=platform%2Fupstream%2FVulkan-Loader.git

cmake: Remove PRIVATE_LIBS from vulkan.pc.in

We don't ship APPLE AND BUILD_STATIC_LOADER so supporting
the pkg-config for it is unneccessary and error prone.

This makes both configuration files consistent.
---

diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 132bc90e..103af2e0 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -395,11 +395,12 @@ add_library(Vulkan::Loader ALIAS vulkan)
 
 if (APPLE AND BUILD_STATIC_LOADER)
     # When exporting a static library all linked libraries - private or not - need to be exported.
+    message(NOTICE "vulkan.pc and VulkanLoaderConfig.cmake not generated for STATIC Apple builds!")
     return()
 endif()
 
-install(TARGETS vulkan EXPORT VulkanLoaderConfig)
 # Generate CMake Configuration File (IE: VulkanLoaderConfig.cmake)
+install(TARGETS vulkan EXPORT VulkanLoaderConfig)
 set_target_properties(vulkan PROPERTIES EXPORT_NAME "Loader")
 install(EXPORT VulkanLoaderConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/VulkanLoader NAMESPACE Vulkan::)
 
@@ -408,16 +409,6 @@ install(EXPORT VulkanLoaderConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Vulk
 # https://gitlab.kitware.com/cmake/cmake/-/issues/22621
 find_package(PkgConfig)
 if (PKG_CONFIG_FOUND)
-    set(PRIVATE_LIBS "")
-    if (APPLE AND BUILD_STATIC_LOADER)
-        # Libs.private should only be present when building a static loader
-        foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES})
-            list(APPEND PRIVATE_LIBS "-l${LIB}")
-        endforeach()
-        list(REMOVE_DUPLICATES PRIVATE_LIBS)
-        set(PRIVATE_LIBS "Libs.private: ${PRIVATE_LIBS}")
-    endif()
-
     if(WIN32)
         if(MINGW)
             set(VULKAN_LIB_SUFFIX "-1.dll")
@@ -426,7 +417,7 @@ if (PKG_CONFIG_FOUND)
         endif()
     endif()
 
-    # BUG: The following code will NOT work will with `cmake --install ... --prefix <dir>`
+    # BUG: The following code will NOT work well with `cmake --install ... --prefix <dir>`
     #
     # ISSUE: vulkan.pc also adds an include path that incidentally points to the vulkan headers.
     # This shouldn't have been added but removing it may break backcompat at this point.
diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
index bcd800c9..b5d59762 100644
--- a/loader/vulkan.pc.in
+++ b/loader/vulkan.pc.in
@@ -1,5 +1,5 @@
 Name: Vulkan-Loader
 Description: Vulkan Loader
 Version: @VULKAN_LOADER_VERSION@
-Libs: -L@CMAKE_INSTALL_LIBDIR_PC@ -lvulkan@VULKAN_LIB_SUFFIX@ @PRIVATE_LIBS@
+Libs: -L@CMAKE_INSTALL_LIBDIR_PC@ -lvulkan@VULKAN_LIB_SUFFIX@
 Cflags: -I@CMAKE_INSTALL_INCLUDEDIR_PC@