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 /mesonbuild/dependencies/misc.py | |
| 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 'mesonbuild/dependencies/misc.py')
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index e5fab64..1bb1b6e 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 @@ -213,7 +217,7 @@ class MPIDependency(ExternalDependency): if not self.is_found and mesonlib.is_windows(): # only Intel Fortran compiler is compatible with Microsoft MPI at this time. - if language == 'fortran' and environment.detect_fortran_compiler(self.for_machine).name_string() != 'intel': + if language == 'fortran' and environment.detect_fortran_compiler(self.for_machine).name_string() != 'intel-cl': return result = self._try_msmpi() if result is not None: |