diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-07-31 00:31:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-31 00:31:15 +0300 |
| commit | 5d9a1558c2e1041b1149fca6b2bceba447b6823e (patch) | |
| tree | f1d776e2956451aa035229567d51f8e00cebc7a2 /mesonbuild/dependencies/misc.py | |
| parent | b72b5365afe319e576e254f12437aeff899eb03e (diff) | |
| parent | f5554957cb2114be6536a15df4db6e34b541c381 (diff) | |
| download | meson-5d9a1558c2e1041b1149fca6b2bceba447b6823e.zip meson-5d9a1558c2e1041b1149fca6b2bceba447b6823e.tar.gz meson-5d9a1558c2e1041b1149fca6b2bceba447b6823e.tar.bz2 | |
Merge pull request #5733 from scivision/pgi_openmp
PGI: correct Fortran so that Fortran run_project_tests.py pass
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index c463ec3..cdfa48b 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -370,13 +370,19 @@ class OpenMPDependency(ExternalDependency): language = kwargs.get('language') super().__init__('openmp', environment, language, kwargs) self.is_found = False + if self.clib_compiler.get_id() == 'pgi': + # through at least PGI 19.4, there is no macro defined for OpenMP, but OpenMP 3.1 is supported. + self.version = '3.1' + self.is_found = True + self.compile_args = self.link_args = self.clib_compiler.openmp_flags() + return try: openmp_date = self.clib_compiler.get_define( '_OPENMP', '', self.env, self.clib_compiler.openmp_flags(), [self], disable_cache=True)[0] except mesonlib.EnvironmentException as e: mlog.debug('OpenMP support not available in the compiler') mlog.debug(e) - openmp_date = False + openmp_date = None if openmp_date: self.version = self.VERSIONS[openmp_date] |