diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-07-21 22:58:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 22:58:17 +0300 |
| commit | 06bf056264e5614ecd779b0e785fb03bba1dfb63 (patch) | |
| tree | e70e236621b0eedba699833c6e8addd26f57e374 /test cases | |
| parent | 793175f665321e50a8b375f89f6e65e0053d6365 (diff) | |
| parent | 5c45a26c270cce4534ef651bfa0179f1472a00e0 (diff) | |
| download | meson-06bf056264e5614ecd779b0e785fb03bba1dfb63.tar.gz | |
Merge pull request #8994 from SoapGentoo/cuda-fixes
Cuda fixes
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/cuda/4 shared/shared/meson.build | 4 | ||||
| -rw-r--r-- | test cases/cuda/8 release/main.cu | 4 | ||||
| -rw-r--r-- | test cases/cuda/8 release/meson.build | 10 |
3 files changed, 15 insertions, 3 deletions
diff --git a/test cases/cuda/4 shared/shared/meson.build b/test cases/cuda/4 shared/shared/meson.build index 59879166b..61cf1d382 100644 --- a/test cases/cuda/4 shared/shared/meson.build +++ b/test cases/cuda/4 shared/shared/meson.build @@ -1,5 +1,7 @@ libkernels = shared_library('kernels', 'kernels.cu', cuda_args: ['-DTAG_IS_SHARED=1', '-DTAG_IS_BUILDING=1'], - gnu_symbol_visibility: 'hidden') + gnu_symbol_visibility: 'hidden', + soversion : 1, + version : '1.2.3') libkernels = declare_dependency(compile_args: ['-DTAG_IS_SHARED=1'], link_with: libkernels) diff --git a/test cases/cuda/8 release/main.cu b/test cases/cuda/8 release/main.cu index bd1dbc4a0..2a9887491 100644 --- a/test cases/cuda/8 release/main.cu +++ b/test cases/cuda/8 release/main.cu @@ -1,6 +1,10 @@ #include <cuda_runtime.h> #include <iostream> +#ifndef NDEBUG +#error "NDEBUG not defined, this is a Meson bug" +#endif + int cuda_devices(void) { int result = 0; cudaGetDeviceCount(&result); diff --git a/test cases/cuda/8 release/meson.build b/test cases/cuda/8 release/meson.build index bdb311d96..c5cad321f 100644 --- a/test cases/cuda/8 release/meson.build +++ b/test cases/cuda/8 release/meson.build @@ -1,4 +1,10 @@ -project('release', 'cuda', version : '1.0.0', default_options : ['buildtype=release']) +project('release', 'cpp', 'cuda', version : '1.0.0', default_options : ['buildtype=release', 'b_ndebug=if-release']) -exe = executable('prog', 'main.cu') +# We don't actually need boost, but it serves as a common dependency +# that has the potential to add "-isystem/usr/include" to the compile +# line. By making it optional, we test that system search paths get +# removed without unnecessarily failing the test if boost is absent. +boost_dep = dependency('boost', include_type : 'system', required : false) + +exe = executable('prog', 'main.cu', dependencies : boost_dep) test('cudatest', exe) |