Cheri-research/snmalloc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use our own loop to find clang-format

Browse Source 
find_program can do that for us. Additionally that loop was resetting
the CLANG_FORMAT every time ninja was run, making it impossible to
pass a specific -DCLANG_FORMAT=... to cmake.

I've tried version 6 to 8 and formatting remains stable. clang 9 is
when it breaks down because of AfterCaseLabel.
This commit is contained in:
Paul Liétar
2020-01-30 20:31:20 +00:00
committed by Matthew Parkinson
parent 0affc069cf
commit 7e22d302ad
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@@ -29,10 +29,10 @@ endmacro()
macro(clangformat_targets) macro(clangformat_targets)
# The clang-format tool is installed under a variety of different names. Try # The clang-format tool is installed under a variety of different names. Try
# to find a sensible one. Only look for 6.0 and 7.0 versions explicitly - we # to find a sensible one. Only look for versions 6 to 8 explicitly - we don't
# don't know whether our clang-format file will work with newer versions of the # know whether our clang-format file will work with newer versions of the
# tool # tool
set(CLANG_FORMAT_NAMES find_program(CLANG_FORMAT NAMES
clang-format-8 clang-format-8
clang-format-7.0 clang-format-7.0
clang-format-6.0 clang-format-6.0
@@ -40,14 +40,6 @@ macro(clangformat_targets)
clang-format60 clang-format60
clang-format) clang-format)
# Loop over each of the possible names of clang-format and try to find one.
set(CLANG_FORMAT CLANG_FORMAT-NOTFOUND)
foreach (NAME IN ITEMS ${CLANG_FORMAT_NAMES})
if (${CLANG_FORMAT} STREQUAL "CLANG_FORMAT-NOTFOUND")
find_program(CLANG_FORMAT ${NAME})
endif ()
endforeach()
# If we've found a clang-format tool, generate a target for it, otherwise emit # If we've found a clang-format tool, generate a target for it, otherwise emit
# a warning. # a warning.
if (${CLANG_FORMAT} STREQUAL "CLANG_FORMAT-NOTFOUND") if (${CLANG_FORMAT} STREQUAL "CLANG_FORMAT-NOTFOUND")