]>
Commit | Line | Data |
---|---|---|
3b1a691b JR |
1 | diff -urNp -x '*.orig' oiio-Release-2.0.13.org/src/cmake/compiler.cmake oiio-Release-2.0.13/src/cmake/compiler.cmake |
2 | --- oiio-Release-2.0.13.org/src/cmake/compiler.cmake 2019-12-03 23:28:14.000000000 +0100 | |
3 | +++ oiio-Release-2.0.13/src/cmake/compiler.cmake 2021-03-07 10:22:00.460540342 +0100 | |
4 | @@ -338,32 +338,6 @@ if (CLANG_TIDY) | |
32c56ab5 JR |
5 | # Hint: run with CLANG_TIDY_ARGS=-list-checks to list all the checks |
6 | endif () | |
7 | ||
8 | -# clang-format | |
9 | -find_program (CLANG_FORMAT_EXE | |
10 | - NAMES clang-format bin/clang-format | |
11 | - HINTS ${CLANG_FORMAT_EXE_HINT} ENV CLANG_FORMAT_EXE_HINT | |
12 | - ENV LLVM_DIRECTORY | |
13 | - NO_DEFAULT_PATH | |
14 | - DOC "Path to clang-format executable") | |
15 | -find_program (CLANG_FORMAT_EXE NAMES clang-format bin/clang-format) | |
16 | -if (CLANG_FORMAT_EXE) | |
17 | - message (STATUS "clang-format found: ${CLANG_FORMAT_EXE}") | |
18 | - # Start with the list of files to include when formatting... | |
19 | - file (GLOB_RECURSE FILES_TO_FORMAT ${CLANG_FORMAT_INCLUDES}) | |
20 | - # ... then process any list of excludes we are given | |
21 | - foreach (_pat ${CLANG_FORMAT_EXCLUDES}) | |
22 | - file (GLOB_RECURSE _excl ${_pat}) | |
23 | - list (REMOVE_ITEM FILES_TO_FORMAT ${_excl}) | |
24 | - endforeach () | |
25 | - #message (STATUS "clang-format file list: ${FILES_TO_FORMAT}") | |
26 | - file (COPY ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format | |
27 | - DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) | |
28 | - add_custom_target (clang-format | |
29 | - COMMAND "${CLANG_FORMAT_EXE}" -i -style=file ${FILES_TO_FORMAT} ) | |
30 | -else () | |
31 | - message (STATUS "clang-format not found.") | |
32 | -endif () | |
33 | - | |
34 | ||
35 | if (EXTRA_CPP_ARGS) | |
36 | message (STATUS "Extra C++ args: ${EXTRA_CPP_ARGS}") |