citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #5500 from FearlessTobi/port-4464-4505 

Port yuzu-emu/yuzu#4464 and yuzu-emu/yuzu#4505: Update clang format to version 10.0
This commit is contained in:
Schplee 2020-08-28 12:13:30 -07:00 committed by GitHub
parent 855dc9f0fc 1255d82b67
commit a5fd11c213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/clang-format/script.sh
View File

@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis*
fi fi
# Default clang-format points to default 3.5 version one # Default clang-format points to default 3.5 version one
CLANG_FORMAT=clang-format-6.0 CLANG_FORMAT=clang-format-10
$CLANG_FORMAT --version $CLANG_FORMAT --version
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then

2
CMakeLists.txt
View File

@ -250,7 +250,7 @@ endif()
# against all the src files. This should be used before making a pull request. # against all the src files. This should be used before making a pull request.
# ======================================================================= # =======================================================================
set(CLANG_FORMAT_POSTFIX "-6.0") set(CLANG_FORMAT_POSTFIX "-10")
find_program(CLANG_FORMAT find_program(CLANG_FORMAT
NAMES clang-format${CLANG_FORMAT_POSTFIX} NAMES clang-format${CLANG_FORMAT_POSTFIX}
clang-format clang-format