File tree Expand file tree Collapse file tree 1 file changed +22
-8
lines changed Expand file tree Collapse file tree 1 file changed +22
-8
lines changed Original file line number Diff line number Diff line change 2121# executable found: ${CLANG_FORMAT_EXECUTABLE}\n" "version:
2222# ${CLANG_FORMAT_VERSION}") endif()
2323
24- find_program (CLANG_FORMAT_EXECUTABLE
25- NAMES clang-format-11
24+ if (CLANG_FORMAT_FOUND)
25+ set (CLANG_FORMAT_FIND_QUIETLY TRUE )
26+ endif ()
27+
28+ set (CLANG_FORMAT_NAMES
29+ clang-format-11
2630 clang-format-12
27- clang-format-10
2831 clang-format
32+ )
2933
30- DOC "clang-format executable" )
31- mark_as_advanced (CLANG_FORMAT_EXECUTABLE)
34+ find_program (CLANG_FORMAT_EXECUTABLE
35+ NAMES ${CLANG_FORMAT_NAMES}
36+ DOC "clang-format executable"
37+ )
3238
3339# Extract version from command "clang-format -version"
3440if (CLANG_FORMAT_EXECUTABLE)
@@ -68,10 +74,18 @@ if(CLANG_FORMAT_EXECUTABLE)
6874 unset (clang_format_version)
6975endif ()
7076
71- if (CLANG_FORMAT_EXECUTABLE)
77+ if (CLANG_FORMAT_EXECUTABLE AND CLANG_FORMAT_VERSION )
7278 set (CLANG_FORMAT_FOUND TRUE )
73- message (STATUS "clang-format executable: ${CLANG_FORMAT_EXECUTABLE} " )
74- message (STATUS "clang-format version: ${CLANG_FORMAT_VERSION} " )
79+
80+ include (FindPackageHandleStandardArgs)
81+
82+ # Set standard args
83+ find_package_handle_standard_args(CLANG_FORMAT
84+ REQUIRED_VARS CLANG_FORMAT_EXECUTABLE
85+ VERSION_VAR CLANG_FORMAT_VERSION
86+ )
87+
88+ mark_as_advanced (CLANG_FORMAT_EXECUTABLE)
7589else ()
7690 set (CLANG_FORMAT_FOUND FALSE )
7791endif ()
You can’t perform that action at this time.
0 commit comments