diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-01-09 21:15:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-09 21:15:11 (GMT) |
| commit | e44c5828d368c81a1f478bf9c12ad4ff1bb87772 (patch) | |
| tree | 9393631133d2e75c946daf813e0637fa8b34d205 /Source/cmMakefile.cxx | |
| parent | e40541339ae8a780bc410f0ef8b22d01e594c1ba (diff) | |
| parent | 81868e6badbb36947a6e89b0e97f2f0526d59a67 (diff) | |
| download | CMake-e44c5828d368c81a1f478bf9c12ad4ff1bb87772.zip CMake-e44c5828d368c81a1f478bf9c12ad4ff1bb87772.tar.gz CMake-e44c5828d368c81a1f478bf9c12ad4ff1bb87772.tar.bz2 | |
Merge topic 'add_cuda_to_source_regex'
81868e6b CUDA: Add cu as default source file extension
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !1629
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 5d6029c..d069a5c 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -967,7 +967,7 @@ void cmMakefile::AddCustomCommandOldStyle( } // Each output must get its own copy of this rule. - cmsys::RegularExpression sourceFiles("\\.(C|M|c|c\\+\\+|cc|cpp|cxx|m|mm|" + cmsys::RegularExpression sourceFiles("\\.(C|M|c|c\\+\\+|cc|cpp|cxx|cu|m|mm|" "rc|def|r|odl|idl|hpj|bat|h|h\\+\\+|" "hm|hpp|hxx|in|txx|inl)$"); for (std::string const& oi : outputs) { |