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 /test cases/common | |
| 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 'test cases/common')
| -rw-r--r-- | test cases/common/190 openmp/meson.build | 21 | ||||
| -rw-r--r-- | test cases/common/223 source set realistic example/meson.build | 6 |
2 files changed, 17 insertions, 10 deletions
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. diff --git a/test cases/common/223 source set realistic example/meson.build b/test cases/common/223 source set realistic example/meson.build index f983e8b..2a9475a 100644 --- a/test cases/common/223 source set realistic example/meson.build +++ b/test cases/common/223 source set realistic example/meson.build @@ -2,6 +2,12 @@ # modules, inspired by QEMU's build system project('sourceset-example', 'cpp') + +cppid = meson.get_compiler('cpp').get_id() +if cppid == 'pgi' + error('MESON_SKIP_TEST: Even PGI 19.4 that claims C++17 full support, cannot handle auto x = y syntax used in this test.') +endif + ss = import('sourceset') kconfig = import('unstable-kconfig') |