aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-06-21 01:24:54 -0400
committerMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-06-24 14:06:32 -0400
commit9a3bc754108b10eb1a9fd4016e8bf7c98f3450c9 (patch)
tree9ab904ad2919d9f273ca888b154744da81e0fa1d
parent838c8d642c2ae0251b7c965a97c2a8d9e6be4d8b (diff)
downloadmeson-9a3bc754108b10eb1a9fd4016e8bf7c98f3450c9.zip
meson-9a3bc754108b10eb1a9fd4016e8bf7c98f3450c9.tar.gz
meson-9a3bc754108b10eb1a9fd4016e8bf7c98f3450c9.tar.bz2
intel windows coarray args
-rw-r--r--mesonbuild/dependencies/misc.py4
-rw-r--r--test cases/fortran/13 coarray/meson.build3
2 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index e5fab64..80bacd2 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -66,6 +66,10 @@ class CoarrayDependency(ExternalDependency):
self.is_found = True
self.link_args = ['-coarray=shared']
self.compile_args = self.link_args
+ elif cid == 'intel-cl':
+ """ Coarrays are built into Intel compilers, no external library needed """
+ self.is_found = True
+ self.compile_args = ['/Qcoarray:shared']
elif cid == 'nagfor':
""" NAG doesn't require any special arguments for Coarray """
self.is_found = True
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)