From af1a266670d040d2f4083ff309d732d648afba2a Mon Sep 17 00:00:00 2001 From: Angelos Mouzakitis Date: Tue, 10 Oct 2023 14:33:42 +0000 Subject: Add submodule dependency files Change-Id: Iaf8d18082d3991dec7c0ebbea540f092188eb4ec --- meson/test cases/common/112 subdir subproject/meson.build | 2 ++ meson/test cases/common/112 subdir subproject/prog/meson.build | 5 +++++ meson/test cases/common/112 subdir subproject/prog/prog.c | 5 +++++ .../common/112 subdir subproject/subprojects/sub/meson.build | 3 +++ meson/test cases/common/112 subdir subproject/subprojects/sub/sub.c | 5 +++++ meson/test cases/common/112 subdir subproject/subprojects/sub/sub.h | 6 ++++++ 6 files changed, 26 insertions(+) create mode 100644 meson/test cases/common/112 subdir subproject/meson.build create mode 100644 meson/test cases/common/112 subdir subproject/prog/meson.build create mode 100644 meson/test cases/common/112 subdir subproject/prog/prog.c create mode 100644 meson/test cases/common/112 subdir subproject/subprojects/sub/meson.build create mode 100644 meson/test cases/common/112 subdir subproject/subprojects/sub/sub.c create mode 100644 meson/test cases/common/112 subdir subproject/subprojects/sub/sub.h (limited to 'meson/test cases/common/112 subdir subproject') diff --git a/meson/test cases/common/112 subdir subproject/meson.build b/meson/test cases/common/112 subdir subproject/meson.build new file mode 100644 index 000000000..54ecfe07a --- /dev/null +++ b/meson/test cases/common/112 subdir subproject/meson.build @@ -0,0 +1,2 @@ +project('proj', 'c') +subdir('prog') diff --git a/meson/test cases/common/112 subdir subproject/prog/meson.build b/meson/test cases/common/112 subdir subproject/prog/meson.build new file mode 100644 index 000000000..360b5f59d --- /dev/null +++ b/meson/test cases/common/112 subdir subproject/prog/meson.build @@ -0,0 +1,5 @@ +subproject('sub') +libSub = dependency('sub', fallback: ['sub', 'libSub']) + +exe = executable('prog', 'prog.c', dependencies: libSub) +test('subdir subproject', exe) diff --git a/meson/test cases/common/112 subdir subproject/prog/prog.c b/meson/test cases/common/112 subdir subproject/prog/prog.c new file mode 100644 index 000000000..9035ff114 --- /dev/null +++ b/meson/test cases/common/112 subdir subproject/prog/prog.c @@ -0,0 +1,5 @@ +#include + +int main(void) { + return sub(); +} diff --git a/meson/test cases/common/112 subdir subproject/subprojects/sub/meson.build b/meson/test cases/common/112 subdir subproject/subprojects/sub/meson.build new file mode 100644 index 000000000..94e9eecd0 --- /dev/null +++ b/meson/test cases/common/112 subdir subproject/subprojects/sub/meson.build @@ -0,0 +1,3 @@ +project('sub', 'c') +lib = static_library('sub', 'sub.c') +libSub = declare_dependency(include_directories: include_directories('.'), link_with: lib) diff --git a/meson/test cases/common/112 subdir subproject/subprojects/sub/sub.c b/meson/test cases/common/112 subdir subproject/subprojects/sub/sub.c new file mode 100644 index 000000000..e748ac750 --- /dev/null +++ b/meson/test cases/common/112 subdir subproject/subprojects/sub/sub.c @@ -0,0 +1,5 @@ +#include "sub.h" + +int sub(void) { + return 0; +} diff --git a/meson/test cases/common/112 subdir subproject/subprojects/sub/sub.h b/meson/test cases/common/112 subdir subproject/subprojects/sub/sub.h new file mode 100644 index 000000000..2b59a3a32 --- /dev/null +++ b/meson/test cases/common/112 subdir subproject/subprojects/sub/sub.h @@ -0,0 +1,6 @@ +#ifndef SUB_H +#define SUB_H + +int sub(void); + +#endif -- cgit 1.2.3-korg