PGI: fix openmp for 190common test

since there is no pgc++ on Windows, we avoid invoking that in 190common

2 files changed, 20 insertions, 20 deletions

diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index ffe2feb..cdfa48b 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -370,20 +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:
-            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
-            else:
-                mlog.debug('OpenMP support not available in the compiler')
-                mlog.debug(e)
-                openmp_date = None
+            mlog.debug('OpenMP support not available in the compiler')
+            mlog.debug(e)
+            openmp_date = None
 
         if openmp_date:
             self.version = self.VERSIONS[openmp_date]
diff --git a/test cases/common/190 openmp/meson.build b/test cases/common/190 openmp/meson.build
index 71bf697..a1154c2 100644
--- a/test cases/common/190 openmp/meson.build
+++ b/test cases/common/190 openmp/meson.build
@@ -1,4 +1,4 @@
-project('openmp', 'c', 'cpp')
+project('openmp', 'c')
 
 cc = meson.get_compiler('c')
 if cc.get_id() == 'gcc' and cc.version().version_compare('<4.2.0')
@@ -21,21 +21,22 @@ if host_machine.system() == 'darwin'
 endif
 
 openmp = dependency('openmp')
+env = environment()
+env.set('OMP_NUM_THREADS', '2')
 
 exec = executable('exec',
   'main.c',
   dependencies : [openmp])
-
-execpp = executable('execpp',
-  'main.cpp',
-  dependencies : [openmp])
-
-env = environment()
-env.set('OMP_NUM_THREADS', '2')
-
 test('OpenMP C', exec, env : env)
-test('OpenMP C++', execpp, env : env)
 
+if not(build_machine.system() == 'windows' and cc.get_id() == 'pgi')
+  if add_languages('cpp', required : false)
+    execpp = executable('execpp',
+      'main.cpp',
+      dependencies : [openmp])
+    test('OpenMP C++', execpp, env : env)
+  endif
+endif
 
 if add_languages('fortran', required : false)
   # Mixing compilers (msvc/clang with gfortran) does not seem to work on Windows.