[template-glib] build: add core_lib_dep() for tests



commit 80cd8f2f1637028db0e33bbad2ae0b04df2ae3b5
Author: Christian Hergert <chergert redhat com>
Date:   Thu May 5 13:40:10 2022 -0700

    build: add core_lib_dep() for tests
    
    This ensures we've built the enums headers before it can begin compiling
    to avoid the race. Also we can avoid the weird include_directories()
    issue from tests/meson.build.

 src/meson.build   | 6 ++++++
 tests/meson.build | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index b622c4d..ff11e0a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -144,6 +144,12 @@ core_lib = static_library('template_glib', libtemplate_glib_sources,
    dependencies: libtemplate_glib_deps,
          c_args: release_args,
 )
+core_lib_dep = declare_dependency(
+              sources: libtemplate_glib_generated_headers,
+         dependencies: libtemplate_glib_deps,
+           link_whole: core_lib,
+  include_directories: include_directories('.'),
+)
 
 libtemplate_glib = library(
   'template_glib-' + apiversion,
diff --git a/tests/meson.build b/tests/meson.build
index 4cb5017..6db580f 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -23,9 +23,7 @@ foreach test: testsuite_sources
 
   test_exe = executable(test_name, test_sources,
                  c_args: testsuite_c_args,
-             link_whole: core_lib,
-           dependencies: [libtemplate_glib_deps],
-    include_directories: include_directories('../src'),
+           dependencies: [core_lib_dep],
   )
 
   test(test_name, test_exe, suite: 'Template-GLib', env: test_env)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]