cmake: Remove CMAKE_INSTALL_INCLUDEDIR_PC
authorJuan Ramos <juan@lunarg.com>
Wed, 4 Oct 2023 21:58:15 +0000 (15:58 -0600)
committerJuan Ramos <114601453+juan-lunarg@users.noreply.github.com>
Wed, 4 Oct 2023 22:13:07 +0000 (16:13 -0600)
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

loader/CMakeLists.txt
loader/vulkan.pc.in

index 103af2e02b258abb0bbc5baff3861d7038da2b97..28000121db12d8a4a6e3f199417aa7f3b969a64f 100644 (file)
@@ -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")
index b5d59762f971d1d825f1d265fe96c43428667c59..16b0ded7993d0549b459006aa75e69776ba35420 100644 (file)
@@ -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@