--- OpenImageIO-oiio-7f79c70/src/cmake/compiler.cmake~ 2019-04-01 07:28:42.000000000 +0200 +++ OpenImageIO-oiio-7f79c70/src/cmake/compiler.cmake 2019-04-21 11:32:25.692670361 +0200 @@ -338,32 +338,6 @@ # Hint: run with CLANG_TIDY_ARGS=-list-checks to list all the checks endif () -# clang-format -find_program (CLANG_FORMAT_EXE - NAMES clang-format bin/clang-format - HINTS ${CLANG_FORMAT_EXE_HINT} ENV CLANG_FORMAT_EXE_HINT - ENV LLVM_DIRECTORY - NO_DEFAULT_PATH - DOC "Path to clang-format executable") -find_program (CLANG_FORMAT_EXE NAMES clang-format bin/clang-format) -if (CLANG_FORMAT_EXE) - message (STATUS "clang-format found: ${CLANG_FORMAT_EXE}") - # Start with the list of files to include when formatting... - file (GLOB_RECURSE FILES_TO_FORMAT ${CLANG_FORMAT_INCLUDES}) - # ... then process any list of excludes we are given - foreach (_pat ${CLANG_FORMAT_EXCLUDES}) - file (GLOB_RECURSE _excl ${_pat}) - list (REMOVE_ITEM FILES_TO_FORMAT ${_excl}) - endforeach () - #message (STATUS "clang-format file list: ${FILES_TO_FORMAT}") - file (COPY ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format - DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) - add_custom_target (clang-format - COMMAND "${CLANG_FORMAT_EXE}" -i -style=file ${FILES_TO_FORMAT} ) -else () - message (STATUS "clang-format not found.") -endif () - if (EXTRA_CPP_ARGS) message (STATUS "Extra C++ args: ${EXTRA_CPP_ARGS}")