Skip to content

Commit 8e52aee

Browse files
committed
Formatting updates
1 parent aaeaa2a commit 8e52aee

File tree

5 files changed

+26
-84
lines changed

5 files changed

+26
-84
lines changed

code-coverage.cmake

Lines changed: 19 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,7 @@ 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(
89-
FORCE
90-
LLVM_COV_PATH
91-
LLVM_PROFDATA_PATH
92-
LCOV_PATH
93-
GENHTML_PATH)
88+
mark_as_advanced(FORCE LLVM_COV_PATH LLVM_PROFDATA_PATH LCOV_PATH GENHTML_PATH)
9489

9590
# Variables
9691
set(CMAKE_COVERAGE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/ccov)
@@ -117,10 +112,7 @@ if(CODE_COVERAGE AND NOT CODE_COVERAGE_ADDED)
117112
# Version number checking for 'EXCLUDE' compatibility
118113
execute_process(COMMAND ${LLVM_COV_PATH} --version
119114
OUTPUT_VARIABLE LLVM_COV_VERSION_CALL_OUTPUT)
120-
string(
121-
REGEX MATCH
122-
"[0-9]+\\.[0-9]+\\.[0-9]+"
123-
LLVM_COV_VERSION
115+
string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" LLVM_COV_VERSION
124116
${LLVM_COV_VERSION_CALL_OUTPUT})
125117

126118
if(LLVM_COV_VERSION VERSION_LESS "7.0.0")
@@ -144,17 +136,14 @@ if(CODE_COVERAGE AND NOT CODE_COVERAGE_ADDED)
144136
COMMAND ;
145137
COMMENT "libs ready for coverage report.")
146138

147-
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU"
148-
OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
139+
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
140+
"GNU")
149141
# Messages
150142
message(STATUS "Building with lcov Code Coverage Tools")
151143

152144
if(CMAKE_BUILD_TYPE)
153145
string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type)
154-
if(NOT
155-
${upper_build_type}
156-
STREQUAL
157-
"DEBUG")
146+
if(NOT ${upper_build_type} STREQUAL "DEBUG")
158147
message(
159148
WARNING
160149
"Code coverage results with an optimized (non-Debug) build may be misleading"
@@ -215,20 +204,12 @@ endif()
215204
# ~~~
216205
function(target_code_coverage TARGET_NAME)
217206
# Argument parsing
218-
set(options
219-
AUTO
220-
ALL
221-
EXTERNAL
222-
PUBLIC
223-
INTERFACE)
207+
set(options AUTO ALL EXTERNAL PUBLIC INTERFACE)
224208
set(single_value_keywords COVERAGE_TARGET_NAME)
225209
set(multi_value_keywords EXCLUDE OBJECTS ARGS)
226210
cmake_parse_arguments(
227-
target_code_coverage
228-
"${options}"
229-
"${single_value_keywords}"
230-
"${multi_value_keywords}"
231-
${ARGN})
211+
target_code_coverage "${options}" "${single_value_keywords}"
212+
"${multi_value_keywords}" ${ARGN})
232213

233214
# Set the visibility of target functions to PUBLIC, INTERFACE or default to
234215
# PRIVATE.
@@ -250,22 +231,13 @@ function(target_code_coverage TARGET_NAME)
250231
# Add code coverage instrumentation to the target's linker command
251232
if(CMAKE_C_COMPILER_ID MATCHES "(Apple)?[Cc]lang"
252233
OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
253-
target_compile_options(
254-
${TARGET_NAME}
255-
${TARGET_VISIBILITY}
256-
-fprofile-instr-generate
257-
-fcoverage-mapping)
258-
target_link_options(
259-
${TARGET_NAME}
260-
${TARGET_VISIBILITY}
261-
-fprofile-instr-generate
262-
-fcoverage-mapping)
263-
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU"
264-
OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
265-
target_compile_options(
266-
${TARGET_NAME}
267-
${TARGET_VISIBILITY}
268-
-fprofile-arcs
234+
target_compile_options(${TARGET_NAME} ${TARGET_VISIBILITY}
235+
-fprofile-instr-generate -fcoverage-mapping)
236+
target_link_options(${TARGET_NAME} ${TARGET_VISIBILITY}
237+
-fprofile-instr-generate -fcoverage-mapping)
238+
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
239+
"GNU")
240+
target_compile_options(${TARGET_NAME} ${TARGET_VISIBILITY} -fprofile-arcs
269241
-ftest-coverage)
270242
target_link_libraries(${TARGET_NAME} ${TARGET_VISIBILITY} gcov)
271243
endif()
@@ -386,10 +358,7 @@ function(target_code_coverage TARGET_NAME)
386358

387359
# Generate exclusion string for use
388360
foreach(EXCLUDE_ITEM ${target_code_coverage_EXCLUDE})
389-
set(EXCLUDE_REGEX
390-
${EXCLUDE_REGEX}
391-
--remove
392-
${COVERAGE_INFO}
361+
set(EXCLUDE_REGEX ${EXCLUDE_REGEX} --remove ${COVERAGE_INFO}
393362
'${EXCLUDE_ITEM}')
394363
endforeach()
395364

@@ -496,12 +465,8 @@ endfunction()
496465
function(add_code_coverage_all_targets)
497466
# Argument parsing
498467
set(multi_value_keywords EXCLUDE)
499-
cmake_parse_arguments(
500-
add_code_coverage_all_targets
501-
""
502-
""
503-
"${multi_value_keywords}"
504-
${ARGN})
468+
cmake_parse_arguments(add_code_coverage_all_targets "" ""
469+
"${multi_value_keywords}" ${ARGN})
505470

506471
if(CODE_COVERAGE)
507472
if(CMAKE_C_COMPILER_ID MATCHES "(Apple)?[Cc]lang"
@@ -567,10 +532,7 @@ function(add_code_coverage_all_targets)
567532
# Exclusion regex string creation
568533
set(EXCLUDE_REGEX)
569534
foreach(EXCLUDE_ITEM ${add_code_coverage_all_targets_EXCLUDE})
570-
set(EXCLUDE_REGEX
571-
${EXCLUDE_REGEX}
572-
--remove
573-
${COVERAGE_INFO}
535+
set(EXCLUDE_REGEX ${EXCLUDE_REGEX} --remove ${COVERAGE_INFO}
574536
'${EXCLUDE_ITEM}')
575537
endforeach()
576538

dependency-graph.cmake

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,8 @@ 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(
63-
gen_dep_graph
64-
"${OPTIONS}"
65-
"${SINGLE_VALUE_KEYWORDS}"
66-
"${MULTI_VALUE_KEYWORDS}"
67-
${ARGN})
62+
cmake_parse_arguments(gen_dep_graph "${OPTIONS}" "${SINGLE_VALUE_KEYWORDS}"
63+
"${MULTI_VALUE_KEYWORDS}" ${ARGN})
6864

6965
if(BUILD_DEP_GRAPH)
7066
if(NOT DOT_EXE)

doxygen.cmake

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,10 @@ 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
57-
TARGET_NAME
58-
INSTALL_PATH
59-
DOXYFILE_PATH
60-
OUTPUT_DIR)
56+
set(SINGLE_VALUE_KEYWORDS TARGET_NAME INSTALL_PATH DOXYFILE_PATH OUTPUT_DIR)
6157
set(MULTI_VALUE_KEYWORDS)
62-
cmake_parse_arguments(
63-
build_docs
64-
"${OPTIONS}"
65-
"${SINGLE_VALUE_KEYWORDS}"
66-
"${MULTI_VALUE_KEYWORDS}"
67-
${ARGN})
58+
cmake_parse_arguments(build_docs "${OPTIONS}" "${SINGLE_VALUE_KEYWORDS}"
59+
"${MULTI_VALUE_KEYWORDS}" ${ARGN})
6860

6961
if(BUILD_DOCUMENTATION)
7062
if(NOT DOXYGEN_FOUND)

formatting.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ 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
51-
_TARGET_TYPE
52-
STREQUAL
53-
"INTERFACE_LIBRARY")
50+
if(NOT _TARGET_TYPE STREQUAL "INTERFACE_LIBRARY")
5451
get_property(
5552
_TEMP
5653
TARGET ${item}

prepare_catch.cmake

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

5550
if(BUILD_TESTS AND NOT TARGET catch)
5651
if(NOT HAVE_CATCH_HPP

0 commit comments

Comments
 (0)