diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-06-24 16:41:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 16:41:10 -0700 |
| commit | ec97bedd8afbf3bcb53b03365fb06fcf8c51b516 (patch) | |
| tree | e468478fa96d3dd7bd96735008e82c756d884e5e /test cases/fortran | |
| parent | e2039da5d99dc8fe4255069ef8ab14459766bf2d (diff) | |
| parent | f990c3eee456a186548dcc48f1d2dca5d8172fe4 (diff) | |
| download | meson-ec97bedd8afbf3bcb53b03365fb06fcf8c51b516.zip meson-ec97bedd8afbf3bcb53b03365fb06fcf8c51b516.tar.gz meson-ec97bedd8afbf3bcb53b03365fb06fcf8c51b516.tar.bz2 | |
Merge pull request #5524 from scivision/icl_ifort
Add ifort on Windows
Diffstat (limited to 'test cases/fortran')
| -rw-r--r-- | test cases/fortran/10 find library/meson.build | 8 | ||||
| -rw-r--r-- | test cases/fortran/13 coarray/meson.build | 3 | ||||
| -rw-r--r-- | test cases/fortran/6 dynamic/meson.build | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/test cases/fortran/10 find library/meson.build b/test cases/fortran/10 find library/meson.build index be66888..2a2ef31 100644 --- a/test cases/fortran/10 find library/meson.build +++ b/test cases/fortran/10 find library/meson.build @@ -1,9 +1,13 @@ project('find fortran library', 'fortran') -fortranc = meson.get_compiler('fortran') +fc = meson.get_compiler('fortran') sources = ['main.f90', 'gzip.f90'] -zlib = fortranc.find_library('z') +zlib = fc.find_library('z', required: false) + +if not zlib.found() + error('MESON_SKIP_TEST: Z library not available.') +endif exe = executable('zlibtest', sources, dependencies : zlib) test('testzlib', exe) diff --git a/test cases/fortran/13 coarray/meson.build b/test cases/fortran/13 coarray/meson.build index 57aa29e..3160aa6 100644 --- a/test cases/fortran/13 coarray/meson.build +++ b/test cases/fortran/13 coarray/meson.build @@ -1,4 +1,5 @@ -project('Fortran coarray', 'fortran') +project('Fortran coarray', 'fortran', + meson_version: '>=0.50') # coarray is required because single-image fallback is an intrinsic feature coarray = dependency('coarray', required : true) diff --git a/test cases/fortran/6 dynamic/meson.build b/test cases/fortran/6 dynamic/meson.build index e5e259f..244a38b 100644 --- a/test cases/fortran/6 dynamic/meson.build +++ b/test cases/fortran/6 dynamic/meson.build @@ -1,5 +1,11 @@ project('dynamic_fortran', 'fortran') +if meson.get_compiler('fortran').get_id() == 'intel-cl' + error('MESON_SKIP_TEST: Windows ifort does not use shared_library in a sane way') + # !DEC$ ATTRIBUTES DLLEXPORT must be used! + # https://software.intel.com/en-us/node/535306 +endif + dynamic = shared_library('dynamic', 'dynamic.f90') exe = executable('test_exe', 'main.f90', link_with : dynamic) test('dynamic-fortran', exe) |