diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-09-16 09:29:36 -0700 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2021-09-20 01:25:21 -0400 |
| commit | 276ff0cc892fbe948018334df58bed289b14f1a2 (patch) | |
| tree | 8309b60e382c1de93da93ba638edbc36dbbe302c | |
| parent | 99112d6c7977c8248d370165ed464a8af2d88e91 (diff) | |
| download | meson-276ff0cc892fbe948018334df58bed289b14f1a2.zip meson-276ff0cc892fbe948018334df58bed289b14f1a2.tar.gz meson-276ff0cc892fbe948018334df58bed289b14f1a2.tar.bz2 | |
tests/fortran/7 generated: don't try to find a configure_file by path
Use the value returned by configure file instead. The issue that caused
this to be required is no longer present.
| -rw-r--r-- | test cases/fortran/7 generated/meson.build | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test cases/fortran/7 generated/meson.build b/test cases/fortran/7 generated/meson.build index b555b17..d1f483d 100644 --- a/test cases/fortran/7 generated/meson.build +++ b/test cases/fortran/7 generated/meson.build @@ -9,10 +9,8 @@ conf_data.set('ONE', 1) conf_data.set('TWO', 2) conf_data.set('THREE', 3) -configure_file(input : 'mod3.fpp', output : 'mod3.f90', configuration : conf_data) -# Manually build absolute path to source file to test -# https://github.com/mesonbuild/meson/issues/7265 -three = library('mod3', meson.current_build_dir() / 'mod3.f90') +mod3_f = configure_file(input : 'mod3.fpp', output : 'mod3.f90', configuration : conf_data) +three = library('mod3', mod3_f) templates_basenames = ['mod2', 'mod1'] generated_sources = [] |