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

cmake: Remove CMAKE_INSTALL_INCLUDEDIR_PC

Currently this just will default to `include` IE it will default
to system includes.

Which gcc already searches for:
https://stackoverflow.com/a/19839946/19739129

Now vulkan.pc will more closely match VulkanLoaderConfig.cmake
---

diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 103af2e0..28000121 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -418,15 +418,11 @@ if (PKG_CONFIG_FOUND)
     endif()
 
     # 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.
+    # due to this code relying on CMAKE_INSTALL_PREFIX being defined at configure time.
     if ("${CMAKE_INSTALL_PREFIX}" STREQUAL "")
         set(CMAKE_INSTALL_LIBDIR_PC ${CMAKE_INSTALL_FULL_LIBDIR})
-        set(CMAKE_INSTALL_INCLUDEDIR_PC ${CMAKE_INSTALL_FULL_INCLUDEDIR})
     else()
         file(RELATIVE_PATH CMAKE_INSTALL_LIBDIR_PC ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR})
-        file(RELATIVE_PATH CMAKE_INSTALL_INCLUDEDIR_PC ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR})
     endif()
     configure_file("vulkan.pc.in" "vulkan.pc" @ONLY)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
index b5d59762..16b0ded7 100644
--- a/loader/vulkan.pc.in
+++ b/loader/vulkan.pc.in
@@ -2,4 +2,3 @@ Name: Vulkan-Loader
 Description: Vulkan Loader
 Version: @VULKAN_LOADER_VERSION@
 Libs: -L@CMAKE_INSTALL_LIBDIR_PC@ -lvulkan@VULKAN_LIB_SUFFIX@
-Cflags: -I@CMAKE_INSTALL_INCLUDEDIR_PC@