mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 14:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-clang-format-cuda' into clang-format-cuda

Browse Source
This commit is contained in:
Brad King
2017-02-14 10:21:22 -05:00
parent 03be8ccbf6 0b2f8ae3ba
commit fa5188d0ed
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeCUDACompilerABI.cu
View File

@@ -1,5 +1,5 @@
#ifndef __CUDACC__
# error "A C or C++ compiler has been selected for CUDA"
#error "A C or C++ compiler has been selected for CUDA"
#endif
#include "CMakeCompilerABI.h"

9
Tests/Cuda/.clang-format Normal file
View File

@@ -0,0 +1,9 @@
---
# This configuration requires clang-format 3.8 or higher.
BasedOnStyle: Mozilla
AlignOperands: false
AlwaysBreakAfterReturnType: None
AlwaysBreakAfterDefinitionReturnType: None
ColumnLimit: 79
Standard: Cpp11
...

9
Tests/CudaOnly/.clang-format Normal file
View File

@@ -0,0 +1,9 @@
---
# This configuration requires clang-format 3.8 or higher.
BasedOnStyle: Mozilla
AlignOperands: false
AlwaysBreakAfterReturnType: None
AlwaysBreakAfterDefinitionReturnType: None
ColumnLimit: 79
Standard: Cpp11
...

2
Utilities/Scripts/clang-format.bash
View File

@@ -107,7 +107,7 @@ case "$mode" in
esac
# Filter sources to which our style should apply.
$git_ls -z -- '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' |
$git_ls -z -- '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' '*.cu' '*.notcu' |
# Exclude lexer/parser generator input and output.
egrep -z -v '^Source/cmCommandArgumentLexer\.' |