aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-02-18 17:39:51 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2021-02-18 17:39:51 +0200
commit19a4da3d9bb2a8a1d5382ffe2f088a3671ee9746 (patch)
tree6fae5d9f0449c65e95940c0a951808a04436b873
parentc24a0f852489124fa002bdc90b5753547899b1cb (diff)
downloadmeson-cfortfix.zip
meson-cfortfix.tar.gz
meson-cfortfix.tar.bz2
Fix combining C and Fortran. Closes #8377.cfortfix
-rw-r--r--test cases/fortran/9 cpp/meson.build12
1 files changed, 10 insertions, 2 deletions
diff --git a/test cases/fortran/9 cpp/meson.build b/test cases/fortran/9 cpp/meson.build
index 7f73985..4a0a896 100644
--- a/test cases/fortran/9 cpp/meson.build
+++ b/test cases/fortran/9 cpp/meson.build
@@ -1,4 +1,4 @@
-project('C++ and FORTRAN', 'cpp', 'fortran')
+project('C++ and FORTRAN', 'c', 'cpp', 'fortran')
cpp = meson.get_compiler('cpp')
fc = meson.get_compiler('fortran')
@@ -17,9 +17,17 @@ if fc.get_id() == 'intel'
endif
e = executable(
+ 'cfort',
+ ['main.c', 'fortran.f'],
+ dependencies : link_with,
+)
+
+test('C and Fortran', e)
+
+e2 = executable(
'cppfort',
['main.cpp', 'fortran.f'],
dependencies : link_with,
)
-test('C++ FORTRAN', e)
+test('C++ and Fortran', e2)