From a0fa5da681bf2f6c5e50435f29583a490253f995 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 21 May 2020 11:28:40 -0400 Subject: meson revert to direct use of dub --- org/spine_build_scaffold.org | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'org/spine_build_scaffold.org') diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org index 8da968c..c18b599 100644 --- a/org/spine_build_scaffold.org +++ b/org/spine_build_scaffold.org @@ -1087,12 +1087,12 @@ spine_src = [ 'src/doc_reform/share/defaults.d', ] source_root = meson.source_root() -src_dir = include_directories('src/', 'subprojects/') +src_dir = include_directories('src/') # Dependencies -dep_tinyendian = dependency('tinyendian', version: '>= 0.2.0', fallback: ['tinyendian', 'tinyendian_dep']) -dep_dyaml = dependency('dyaml', version: '>= 0.8.0', fallback: ['dyaml', 'dyaml_dep']) -dep_d2sqlite3 = dependency('d2sqlite3', version: '>= 0.18.3', fallback: ['d2sqlite3', 'd2sqlite3_dep']) -dep_imageformats = dependency('imageformats', version: '>= 7.0.2', fallback: ['imageformats', 'imageformats_dep']) +dep_tinyendian = dependency('tinyendian', version: '>= 0.2.0', fallback: ['tinyendian', 'tinyendian_dep'], method: 'dub') +dep_dyaml = dependency('dyaml', version: '>= 0.8.0', fallback: ['dyaml', 'dyaml_dep'], method: 'dub') +dep_d2sqlite3 = dependency('d2sqlite3', version: '>= 0.18.3', fallback: ['d2sqlite3', 'd2sqlite3_dep'], method: 'dub') +dep_imageformats = dependency('imageformats', version: '>= 7.0.2', fallback: ['imageformats', 'imageformats_dep'], method: 'dub') # Executable spine_exe = executable('spine', [spine_src], @@ -1108,7 +1108,7 @@ spine_exe = executable('spine', ) #+END_SRC -** meson subprojects [can be taken care of using dub] +** meson subprojects [taken care of using dub] *** README #+BEGIN_SRC txt :tangle ../subprojects/README @@ -1148,7 +1148,7 @@ revision = head **** meson.build -#+BEGIN_SRC sh :tangle ../subprojects/d2sqlite3.meson.build +#+BEGIN_SRC sh :NO-tangle ../subprojects/d2sqlite3.meson.build project('d2sqlite3', 'd', meson_version: '>=0.46', license: 'BSL-1.0', @@ -1298,7 +1298,7 @@ revision = head **** meson.build -#+BEGIN_SRC sh :tangle ../subprojects/imageformats.meson.build +#+BEGIN_SRC sh :NO-tangle ../subprojects/imageformats.meson.build project('imageformats', 'd', meson_version: '>=0.46', license: 'BSL-1.0', -- cgit v1.2.3