From df89aa6600687e15ec5fc097d18c45dd02c59c64 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 15 Mar 2017 09:59:36 +0000 Subject: [PATCH] build: Improve pkg-config to handle 64-bit distros Fixes #1582 Change-Id: I2f06a7016643f61d7e6341df20f355cb510350ab --- loader/CMakeLists.txt | 2 +- loader/vulkan.pc.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index c784a22..d15f09c 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -156,6 +156,6 @@ else() endforeach() configure_file("vulkan.pc.in" "vulkan.pc" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" - DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") endif() endif() diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in index b0dacbc..717aa74 100644 --- a/loader/vulkan.pc.in +++ b/loader/vulkan.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include/vulkan +exec_prefix=@CMAKE_INSTALL_PREFIX@ +libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +includedir=${prefix}/include Name: @CMAKE_PROJECT_NAME@ Description: Vulkan Loader -- 2.7.4