From 750f6e327caec6d66ef3c12fc5c9a1d85ca430d4 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 28 Jan 2025 11:29:30 -0800 Subject: [PATCH] build: add meson dep overrides for all internal libs This allows for subprojects to depend on the internal Lix build and have it work properly. Change-Id: Iaf05725fb95ea8abb171c71a1b17b0062c89f548 --- lix/libcmd/meson.build | 1 + lix/libexpr/meson.build | 1 + lix/libfetchers/meson.build | 1 + lix/libmain/meson.build | 1 + lix/libstore/meson.build | 1 + lix/libutil/meson.build | 1 + 6 files changed, 6 insertions(+) diff --git a/lix/libcmd/meson.build b/lix/libcmd/meson.build index 30d1f4f73..637f5eff1 100644 --- a/lix/libcmd/meson.build +++ b/lix/libcmd/meson.build @@ -75,6 +75,7 @@ liblixcmd = declare_dependency( include_directories : include_directories('../..'), link_with : libcmd, ) +meson.override_dependency('lix-cmd', liblixcmd) # FIXME: not using the pkg-config module because it creates way too many deps # while meson migration is in progress, and we want to not include boost here diff --git a/lix/libexpr/meson.build b/lix/libexpr/meson.build index 35f8432a0..e2f785a5b 100644 --- a/lix/libexpr/meson.build +++ b/lix/libexpr/meson.build @@ -308,6 +308,7 @@ if is_static else liblixexpr_mstatic = liblixexpr endif +meson.override_dependency('lix-expr', liblixexpr_mstatic) # FIXME: not using the pkg-config module because it creates way too many deps # while meson migration is in progress, and we want to not include boost here diff --git a/lix/libfetchers/meson.build b/lix/libfetchers/meson.build index 980da8a2b..95c110736 100644 --- a/lix/libfetchers/meson.build +++ b/lix/libfetchers/meson.build @@ -95,3 +95,4 @@ if is_static else liblixfetchers_mstatic = liblixfetchers endif +meson.override_dependency('lix-fetchers', liblixfetchers_mstatic) diff --git a/lix/libmain/meson.build b/lix/libmain/meson.build index c71607983..8757d98f3 100644 --- a/lix/libmain/meson.build +++ b/lix/libmain/meson.build @@ -36,6 +36,7 @@ liblixmain = declare_dependency( include_directories : include_directories('../..'), link_with : libmain, ) +meson.override_dependency('lix-main', liblixmain) # FIXME: not using the pkg-config module because it creates way too many deps # while meson migration is in progress, and we want to not include boost here diff --git a/lix/libstore/meson.build b/lix/libstore/meson.build index 00ed7f576..fa3d206c2 100644 --- a/lix/libstore/meson.build +++ b/lix/libstore/meson.build @@ -378,6 +378,7 @@ if is_static else liblixstore_mstatic = liblixstore endif +meson.override_dependency('lix-store', liblixstore_mstatic) # FIXME: not using the pkg-config module because it creates way too many deps # while meson migration is in progress, and we want to not include boost here diff --git a/lix/libutil/meson.build b/lix/libutil/meson.build index 5154f1ae2..d27eb3e6e 100644 --- a/lix/libutil/meson.build +++ b/lix/libutil/meson.build @@ -344,3 +344,4 @@ if is_static else liblixutil_mstatic = liblixutil endif +meson.override_dependency('lix-util', liblixutil_mstatic)