File tree Expand file tree Collapse file tree 3 files changed +18
-14
lines changed
external/clang-format/cmake Expand file tree Collapse file tree 3 files changed +18
-14
lines changed Original file line number Diff line number Diff line change @@ -79,16 +79,16 @@ endfunction()
7979
8080# Specifies sources to be formatted by the target
8181function (ClangFormatTargetSources TARGET FILE_PATHS)
82- # Early return if clang-formt is not available
83- if (NOT TARGET ${TARGET} )
84- message (FATAL_ERROR "Target ${TARGET} is not valid." )
85- endif ()
86-
8782 # Early return if clang-formt is not available
8883 if (NOT CLANG_FORMAT_EXECUTABLE)
8984 return ()
9085 endif ()
9186
87+ # Early return if target is not valid
88+ if (NOT TARGET ${TARGET} )
89+ message (FATAL_ERROR "Target ${TARGET} is not valid." )
90+ endif ()
91+
9292 # Add files to the target
9393 get_filename_component (FULL_BINARY_DIR ${CMAKE_BINARY_DIR} REALPATH)
9494 foreach (FILE_PATH ${FILE_PATHS} )
Original file line number Diff line number Diff line change @@ -86,11 +86,13 @@ function(configureModule MODULE_NAME)
8686 endif ()
8787
8888 # Configure source formatting
89- set (MODULE_CLANG_FORMAT_TARGET "clang-format-${MODULE_NAME} " )
90- ClangFormatAddTarget("${MODULE_CLANG_FORMAT_TARGET} " )
91- ClangFormatTargetSources("${MODULE_CLANG_FORMAT_TARGET} " "${${UPPER_MODULE_NAME} _SOURCES}" )
92- ClangFormatTargetSources("${MODULE_CLANG_FORMAT_TARGET} " "${${UPPER_MODULE_NAME} _HEADERS}" )
93- add_dependencies (${CLANG_FORMAT_TARGET} "${MODULE_CLANG_FORMAT_TARGET} " )
89+ if (CLANG_FORMAT_EXECUTABLE)
90+ set (MODULE_CLANG_FORMAT_TARGET "clang-format-${MODULE_NAME} " )
91+ ClangFormatAddTarget("${MODULE_CLANG_FORMAT_TARGET} " )
92+ ClangFormatTargetSources("${MODULE_CLANG_FORMAT_TARGET} " "${${UPPER_MODULE_NAME} _SOURCES}" )
93+ ClangFormatTargetSources("${MODULE_CLANG_FORMAT_TARGET} " "${${UPPER_MODULE_NAME} _HEADERS}" )
94+ add_dependencies (${CLANG_FORMAT_TARGET} "${MODULE_CLANG_FORMAT_TARGET} " )
95+ endif ()
9496
9597endfunction ()
9698
Original file line number Diff line number Diff line change @@ -186,10 +186,12 @@ function(addTest TEST_NAME TEST_TYPE TEST_LIBRARIES WORKING_DIRECTORY N_PROCS PA
186186 endif ()
187187
188188 # Configure source formatting
189- set (TEST_CLANG_FORMAT_TARGET "clang-format-${TEST_TARGET_NAME} " )
190- ClangFormatAddTarget("${TEST_CLANG_FORMAT_TARGET} " )
191- ClangFormatTargetSources("${TEST_CLANG_FORMAT_TARGET} " "${TEST_NAME} .cpp" )
192- add_dependencies (${CLANG_FORMAT_TARGET} "${TEST_CLANG_FORMAT_TARGET} " )
189+ if (CLANG_FORMAT_EXECUTABLE)
190+ set (TEST_CLANG_FORMAT_TARGET "clang-format-${TEST_TARGET_NAME} " )
191+ ClangFormatAddTarget("${TEST_CLANG_FORMAT_TARGET} " )
192+ ClangFormatTargetSources("${TEST_CLANG_FORMAT_TARGET} " "${TEST_NAME} .cpp" )
193+ add_dependencies (${CLANG_FORMAT_TARGET} "${TEST_CLANG_FORMAT_TARGET} " )
194+ endif ()
193195
194196 # Add test
195197 add_test (NAME "${TEST_TARGET_NAME} " COMMAND ${TEST_EXEC} ${TEST_ARGS} WORKING_DIRECTORY "${WORKING_DIRECTORY} " )
You can’t perform that action at this time.
0 commit comments