diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-02-04 20:33:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-04 20:33:26 +0100 |
| commit | e26b5a119e0b3f76cc93f65ecf4251dc6d52ecfe (patch) | |
| tree | 73851cd37b531388e4866a480c96a4e3b9644382 /mesonbuild/build.py | |
| parent | c1fa61b7d9361d563e22b48974b55a188b7e9d70 (diff) | |
| parent | 592af0b1afa03b10beffee481c00c60a7b7db907 (diff) | |
| download | meson-e26b5a119e0b3f76cc93f65ecf4251dc6d52ecfe.zip meson-e26b5a119e0b3f76cc93f65ecf4251dc6d52ecfe.tar.gz meson-e26b5a119e0b3f76cc93f65ecf4251dc6d52ecfe.tar.bz2 | |
Merge pull request #4835 from obilaniu/cudaimprovements
CUDA support improvements
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 7909613..702b338 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -36,6 +36,7 @@ pch_kwargs = set(['c_pch', 'cpp_pch']) lang_arg_kwargs = set([ 'c_args', 'cpp_args', + 'cuda_args', 'd_args', 'd_import_dirs', 'd_unittest', @@ -797,13 +798,13 @@ just like those detected with the dependency() function.''') for linktarget in lwhole: self.link_whole(linktarget) - c_pchlist, cpp_pchlist, clist, cpplist, cslist, valalist, objclist, objcpplist, fortranlist, rustlist \ - = extract_as_list(kwargs, 'c_pch', 'cpp_pch', 'c_args', 'cpp_args', 'cs_args', 'vala_args', 'objc_args', + c_pchlist, cpp_pchlist, clist, cpplist, cudalist, cslist, valalist, objclist, objcpplist, fortranlist, rustlist \ + = extract_as_list(kwargs, 'c_pch', 'cpp_pch', 'c_args', 'cpp_args', 'cuda_args', 'cs_args', 'vala_args', 'objc_args', 'objcpp_args', 'fortran_args', 'rust_args') self.add_pch('c', c_pchlist) self.add_pch('cpp', cpp_pchlist) - compiler_args = {'c': clist, 'cpp': cpplist, 'cs': cslist, 'vala': valalist, 'objc': objclist, 'objcpp': objcpplist, + compiler_args = {'c': clist, 'cpp': cpplist, 'cuda': cudalist, 'cs': cslist, 'vala': valalist, 'objc': objclist, 'objcpp': objcpplist, 'fortran': fortranlist, 'rust': rustlist } for key, value in compiler_args.items(): |