Skip to content

Commit 1f822d1

Browse files
committed
Minor formatting fixes
1 parent b560786 commit 1f822d1

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

Diff for: FindOpenXR.cmake

+8-6
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@ find_library(OpenXR_LIBRARY NAMES openxr_loader Debug/openxr_loader)
3636
set(OpenXR_INCLUDE_DIRS ${OpenXR_INCLUDE_DIR})
3737
set(OpenXR_LIBRARIES ${OpenXR_LIBRARY})
3838

39-
find_package_handle_standard_args(OpenXR DEFAULT_MSG OpenXR_INCLUDE_DIR OpenXR_LIBRARY)
39+
find_package_handle_standard_args(OpenXR DEFAULT_MSG OpenXR_INCLUDE_DIR
40+
OpenXR_LIBRARY)
4041

4142
mark_as_advanced(OpenXR_INCLUDE_DIR OpenXR_LIBRARY)
4243

4344
if(OpenXR_FOUND AND NOT TARGET OpenXR::OpenXR)
44-
add_library(OpenXR::OpenXR UNKNOWN IMPORTED)
45-
set_target_properties(
46-
OpenXR::OpenXR PROPERTIES IMPORTED_LOCATION "${OpenXR_LIBRARIES}"
47-
INTERFACE_INCLUDE_DIRECTORIES "${OpenXR_INCLUDE_DIRS}")
48-
endif()
45+
add_library(OpenXR::OpenXR UNKNOWN IMPORTED)
46+
set_target_properties(
47+
OpenXR::OpenXR
48+
PROPERTIES IMPORTED_LOCATION "${OpenXR_LIBRARIES}"
49+
INTERFACE_INCLUDE_DIRECTORIES "${OpenXR_INCLUDE_DIRS}")
50+
endif()

Diff for: code-coverage.cmake

+12-12
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ if(CODE_COVERAGE AND NOT CODE_COVERAGE_ADDED)
113113
execute_process(COMMAND ${LLVM_COV_PATH} --version
114114
OUTPUT_VARIABLE LLVM_COV_VERSION_CALL_OUTPUT)
115115
string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" LLVM_COV_VERSION
116-
${LLVM_COV_VERSION_CALL_OUTPUT})
116+
${LLVM_COV_VERSION_CALL_OUTPUT})
117117

118118
if(LLVM_COV_VERSION VERSION_LESS "7.0.0")
119119
message(
@@ -238,7 +238,7 @@ function(target_code_coverage TARGET_NAME)
238238
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
239239
"GNU")
240240
target_compile_options(${TARGET_NAME} ${TARGET_VISIBILITY} -fprofile-arcs
241-
-ftest-coverage)
241+
-ftest-coverage)
242242
target_link_libraries(${TARGET_NAME} ${TARGET_VISIBILITY} gcov)
243243
endif()
244244

@@ -344,8 +344,8 @@ function(target_code_coverage TARGET_NAME)
344344
-format="html" ${EXCLUDE_REGEX}
345345
DEPENDS ccov-processing-${target_code_coverage_COVERAGE_TARGET_NAME})
346346

347-
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU"
348-
OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
347+
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
348+
"GNU")
349349
set(COVERAGE_INFO
350350
"${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${target_code_coverage_COVERAGE_TARGET_NAME}.info"
351351
)
@@ -359,7 +359,7 @@ function(target_code_coverage TARGET_NAME)
359359
# Generate exclusion string for use
360360
foreach(EXCLUDE_ITEM ${target_code_coverage_EXCLUDE})
361361
set(EXCLUDE_REGEX ${EXCLUDE_REGEX} --remove ${COVERAGE_INFO}
362-
'${EXCLUDE_ITEM}')
362+
'${EXCLUDE_ITEM}')
363363
endforeach()
364364

365365
if(EXCLUDE_REGEX)
@@ -411,8 +411,8 @@ function(target_code_coverage TARGET_NAME)
411411
endif()
412412
add_dependencies(ccov ccov-${target_code_coverage_COVERAGE_TARGET_NAME})
413413

414-
if(NOT CMAKE_C_COMPILER_ID MATCHES "GNU"
415-
OR NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU")
414+
if(NOT CMAKE_C_COMPILER_ID MATCHES "GNU" OR NOT CMAKE_CXX_COMPILER_ID
415+
MATCHES "GNU")
416416
if(NOT TARGET ccov-report)
417417
add_custom_target(ccov-report)
418418
endif()
@@ -446,8 +446,8 @@ function(add_code_coverage)
446446
OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
447447
add_compile_options(-fprofile-instr-generate -fcoverage-mapping)
448448
add_link_options(-fprofile-instr-generate -fcoverage-mapping)
449-
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU"
450-
OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
449+
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
450+
"GNU")
451451
add_compile_options(-fprofile-arcs -ftest-coverage)
452452
link_libraries(gcov)
453453
endif()
@@ -522,8 +522,8 @@ function(add_code_coverage_all_targets)
522522
-format="html" ${EXCLUDE_REGEX}
523523
DEPENDS ccov-all-processing)
524524

525-
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU"
526-
OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
525+
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
526+
"GNU")
527527
set(COVERAGE_INFO "${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.info")
528528

529529
# Nothing required for gcov
@@ -533,7 +533,7 @@ function(add_code_coverage_all_targets)
533533
set(EXCLUDE_REGEX)
534534
foreach(EXCLUDE_ITEM ${add_code_coverage_all_targets_EXCLUDE})
535535
set(EXCLUDE_REGEX ${EXCLUDE_REGEX} --remove ${COVERAGE_INFO}
536-
'${EXCLUDE_ITEM}')
536+
'${EXCLUDE_ITEM}')
537537
endforeach()
538538

539539
if(EXCLUDE_REGEX)

0 commit comments

Comments
 (0)