Skip to content

Commit b65d4d0

Browse files
committed
Updated formatting using cmake-format
1 parent 25b65c0 commit b65d4d0

5 files changed

+71
-25
lines changed

Diff for: code-coverage.cmake

+40-15
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@ find_program(LLVM_PROFDATA_PATH llvm-profdata)
8585
find_program(LCOV_PATH lcov)
8686
find_program(GENHTML_PATH genhtml)
8787
# Hide behind the 'advanced' mode flag for GUI/ccmake
88-
mark_as_advanced(FORCE LLVM_COV_PATH LLVM_PROFDATA_PATH LCOV_PATH GENHTML_PATH)
88+
mark_as_advanced(
89+
FORCE
90+
LLVM_COV_PATH
91+
LLVM_PROFDATA_PATH
92+
LCOV_PATH
93+
GENHTML_PATH)
8994

9095
# Variables
9196
set(CMAKE_COVERAGE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/ccov)
@@ -112,8 +117,11 @@ if(CODE_COVERAGE AND NOT CODE_COVERAGE_ADDED)
112117
# Version number checking for 'EXCLUDE' compatibility
113118
execute_process(COMMAND ${LLVM_COV_PATH} --version
114119
OUTPUT_VARIABLE LLVM_COV_VERSION_CALL_OUTPUT)
115-
string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" LLVM_COV_VERSION
116-
${LLVM_COV_VERSION_CALL_OUTPUT})
120+
string(
121+
REGEX MATCH
122+
"[0-9]+\\.[0-9]+\\.[0-9]+"
123+
LLVM_COV_VERSION
124+
${LLVM_COV_VERSION_CALL_OUTPUT})
117125

118126
if(LLVM_COV_VERSION VERSION_LESS "7.0.0")
119127
message(
@@ -142,7 +150,10 @@ if(CODE_COVERAGE AND NOT CODE_COVERAGE_ADDED)
142150

143151
if(CMAKE_BUILD_TYPE)
144152
string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type)
145-
if(NOT ${upper_build_type} STREQUAL "DEBUG")
153+
if(NOT
154+
${upper_build_type}
155+
STREQUAL
156+
"DEBUG")
146157
message(
147158
WARNING
148159
"Code coverage results with an optimized (non-Debug) build may be misleading"
@@ -212,8 +223,11 @@ function(target_code_coverage TARGET_NAME)
212223
set(single_value_keywords COVERAGE_TARGET_NAME)
213224
set(multi_value_keywords EXCLUDE OBJECTS ARGS)
214225
cmake_parse_arguments(
215-
target_code_coverage "${options}" "${single_value_keywords}"
216-
"${multi_value_keywords}" ${ARGN})
226+
target_code_coverage
227+
"${options}"
228+
"${single_value_keywords}"
229+
"${multi_value_keywords}"
230+
${ARGN})
217231

218232
# Set the visibility of target functions to PUBLIC, INTERFACE or default to
219233
# PRIVATE.
@@ -313,9 +327,10 @@ function(target_code_coverage TARGET_NAME)
313327
# Merge the generated profile data so llvm-cov can process it
314328
add_custom_target(
315329
ccov-processing-${target_code_coverage_COVERAGE_TARGET_NAME}
316-
COMMAND ${LLVM_PROFDATA_PATH} merge -sparse
317-
${target_code_coverage_COVERAGE_TARGET_NAME}.profraw -o
318-
${target_code_coverage_COVERAGE_TARGET_NAME}.profdata
330+
COMMAND
331+
${LLVM_PROFDATA_PATH} merge -sparse
332+
${target_code_coverage_COVERAGE_TARGET_NAME}.profraw -o
333+
${target_code_coverage_COVERAGE_TARGET_NAME}.profdata
319334
DEPENDS ccov-run-${target_code_coverage_COVERAGE_TARGET_NAME})
320335

321336
# Ignore regex only works on LLVM >= 7
@@ -368,8 +383,11 @@ function(target_code_coverage TARGET_NAME)
368383

369384
# Generate exclusion string for use
370385
foreach(EXCLUDE_ITEM ${target_code_coverage_EXCLUDE})
371-
set(EXCLUDE_REGEX ${EXCLUDE_REGEX} --remove ${COVERAGE_INFO}
372-
'${EXCLUDE_ITEM}')
386+
set(EXCLUDE_REGEX
387+
${EXCLUDE_REGEX}
388+
--remove
389+
${COVERAGE_INFO}
390+
'${EXCLUDE_ITEM}')
373391
endforeach()
374392

375393
if(EXCLUDE_REGEX)
@@ -473,8 +491,12 @@ endfunction()
473491
function(add_code_coverage_all_targets)
474492
# Argument parsing
475493
set(multi_value_keywords EXCLUDE)
476-
cmake_parse_arguments(add_code_coverage_all_targets "" ""
477-
"${multi_value_keywords}" ${ARGN})
494+
cmake_parse_arguments(
495+
add_code_coverage_all_targets
496+
""
497+
""
498+
"${multi_value_keywords}"
499+
${ARGN})
478500

479501
if(CODE_COVERAGE)
480502
if(CMAKE_C_COMPILER_ID MATCHES "(Apple)?[Cc]lang"
@@ -539,8 +561,11 @@ function(add_code_coverage_all_targets)
539561
# Exclusion regex string creation
540562
set(EXCLUDE_REGEX)
541563
foreach(EXCLUDE_ITEM ${add_code_coverage_all_targets_EXCLUDE})
542-
set(EXCLUDE_REGEX ${EXCLUDE_REGEX} --remove ${COVERAGE_INFO}
543-
'${EXCLUDE_ITEM}')
564+
set(EXCLUDE_REGEX
565+
${EXCLUDE_REGEX}
566+
--remove
567+
${COVERAGE_INFO}
568+
'${EXCLUDE_ITEM}')
544569
endforeach()
545570

546571
if(EXCLUDE_REGEX)

Diff for: dependency-graph.cmake

+10-5
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,12 @@ function(gen_dep_graph OUTPUT_TYPE)
5959
set(OPTIONS ADD_TO_DEP_GRAPH)
6060
set(SINGLE_VALUE_KEYWORDS TARGET_NAME OUTPUT_DIR)
6161
set(MULTI_VALUE_KEYWORDS)
62-
cmake_parse_arguments(gen_dep_graph "${OPTIONS}" "${SINGLE_VALUE_KEYWORDS}"
63-
"${MULTI_VALUE_KEYWORDS}" ${ARGN})
62+
cmake_parse_arguments(
63+
gen_dep_graph
64+
"${OPTIONS}"
65+
"${SINGLE_VALUE_KEYWORDS}"
66+
"${MULTI_VALUE_KEYWORDS}"
67+
${ARGN})
6468

6569
if(BUILD_DEP_GRAPH)
6670
if(NOT DOT_EXE)
@@ -83,9 +87,10 @@ function(gen_dep_graph OUTPUT_TYPE)
8387
${TARGET_NAME}
8488
COMMAND ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR}
8589
--graphviz=${CMAKE_CURRENT_BINARY_DIR}/graphviz/${TARGET_NAME}.dot
86-
COMMAND ${DOT_EXE} -T${OUTPUT_TYPE}
87-
${CMAKE_CURRENT_BINARY_DIR}/graphviz/${TARGET_NAME}.dot -o
88-
${OUT_DIR}/${TARGET_NAME}.${OUTPUT_TYPE})
90+
COMMAND
91+
${DOT_EXE} -T${OUTPUT_TYPE}
92+
${CMAKE_CURRENT_BINARY_DIR}/graphviz/${TARGET_NAME}.dot -o
93+
${OUT_DIR}/${TARGET_NAME}.${OUTPUT_TYPE})
8994

9095
add_custom_command(
9196
TARGET ${TARGET_NAME}

Diff for: doxygen.cmake

+11-3
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,18 @@ option(BUILD_DOCUMENTATION "Build API documentation using Doxygen. (make doc)"
5353
# ~~~
5454
function(build_docs)
5555
set(OPTIONS ADD_TO_DOC INSTALLABLE PROCESS_DOXYFILE)
56-
set(SINGLE_VALUE_KEYWORDS TARGET_NAME INSTALL_PATH DOXYFILE_PATH OUTPUT_DIR)
56+
set(SINGLE_VALUE_KEYWORDS
57+
TARGET_NAME
58+
INSTALL_PATH
59+
DOXYFILE_PATH
60+
OUTPUT_DIR)
5761
set(MULTI_VALUE_KEYWORDS)
58-
cmake_parse_arguments(build_docs "${OPTIONS}" "${SINGLE_VALUE_KEYWORDS}"
59-
"${MULTI_VALUE_KEYWORDS}" ${ARGN})
62+
cmake_parse_arguments(
63+
build_docs
64+
"${OPTIONS}"
65+
"${SINGLE_VALUE_KEYWORDS}"
66+
"${MULTI_VALUE_KEYWORDS}"
67+
${ARGN})
6068

6169
if(BUILD_DOCUMENTATION)
6270
if(NOT DOXYGEN_FOUND)

Diff for: formatting.cmake

+4-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ function(clang_format TARGET_NAME)
4747
# If the item is a target, then we'll attempt to grab the associated
4848
# source files from it.
4949
get_target_property(_TARGET_TYPE ${item} TYPE)
50-
if(NOT _TARGET_TYPE STREQUAL "INTERFACE_LIBRARY")
50+
if(NOT
51+
_TARGET_TYPE
52+
STREQUAL
53+
"INTERFACE_LIBRARY")
5154
get_property(
5255
_TEMP
5356
TARGET ${item}

Diff for: prepare_catch.cmake

+6-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ mark_as_advanced(FORCE HAVE_CATCH_HPP)
4545
# ~~~
4646
function(prepare_catch)
4747
set(options COMPILED_CATCH CATCH1 CLONE)
48-
cmake_parse_arguments(build_tests "${options}" "" "" ${ARGN})
48+
cmake_parse_arguments(
49+
build_tests
50+
"${options}"
51+
""
52+
""
53+
${ARGN})
4954

5055
if(BUILD_TESTS AND NOT TARGET catch)
5156
if(NOT HAVE_CATCH_HPP

0 commit comments

Comments
 (0)