Browse Source

vulkan/overlay: install layer binary in libdir

This will allow multilib.

v2: Drop path from json file, dlopen should be able to locate the lib in libdir

v3: Switch from configure_file to install_data (Dylan)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109788
Tested-by: Mike Lothian <mike@fireburn.co.uk>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
tags/19.1-branchpoint
Lionel Landwerlin 6 years ago
parent
commit
2fff5966d6

src/vulkan/overlay-layer/VkLayer_MESA_overlay.json.in → src/vulkan/overlay-layer/VkLayer_MESA_overlay.json View File

@@ -3,7 +3,7 @@
"layer" : {
"name": "VK_LAYER_MESA_overlay",
"type": "GLOBAL",
"library_path": "@install_dir@/libVkLayer_MESA_overlay.so",
"library_path": "libVkLayer_MESA_overlay.so",
"api_version": "1.1.73",
"implementation_version": "1",
"description": "Mesa Overlay layer"

+ 3
- 12
src/vulkan/overlay-layer/meson.build View File

@@ -18,8 +18,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

vklayer_install_dir = join_paths(get_option('prefix'), 'share', 'vulkan', 'explicit_layer.d')

glslang = find_program('glslangValidator')

overlay_shaders = [
@@ -47,17 +45,10 @@ vklayer_mesa_overlay = shared_library(
include_directories : [inc_common, inc_vulkan_util],
link_args : cc.get_supported_link_arguments(['-Wl,-Bsymbolic-functions', '-Wl,-z,relro']),
link_with : [libmesa_util, libvulkan_util],
install_dir : vklayer_install_dir,
install : true
)

sdata = configuration_data()
sdata.set('install_dir', vklayer_install_dir)

configure_file(
input : 'VkLayer_MESA_overlay.json.in',
output : '@BASENAME@',
configuration : sdata,
install_dir : vklayer_install_dir,
install : true
install_data(
files('VkLayer_MESA_overlay.json'),
install_dir : join_paths(get_option('datadir'), 'vulkan', 'explicit_layer.d'),
)

Loading…
Cancel
Save