Skip to content

Commit

Permalink
Minor formatting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
StableCoder committed Jan 4, 2021
1 parent b560786 commit 1f822d1
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 18 deletions.
14 changes: 8 additions & 6 deletions FindOpenXR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@ find_library(OpenXR_LIBRARY NAMES openxr_loader Debug/openxr_loader)
set(OpenXR_INCLUDE_DIRS ${OpenXR_INCLUDE_DIR})
set(OpenXR_LIBRARIES ${OpenXR_LIBRARY})

find_package_handle_standard_args(OpenXR DEFAULT_MSG OpenXR_INCLUDE_DIR OpenXR_LIBRARY)
find_package_handle_standard_args(OpenXR DEFAULT_MSG OpenXR_INCLUDE_DIR
OpenXR_LIBRARY)

mark_as_advanced(OpenXR_INCLUDE_DIR OpenXR_LIBRARY)

if(OpenXR_FOUND AND NOT TARGET OpenXR::OpenXR)
add_library(OpenXR::OpenXR UNKNOWN IMPORTED)
set_target_properties(
OpenXR::OpenXR PROPERTIES IMPORTED_LOCATION "${OpenXR_LIBRARIES}"
INTERFACE_INCLUDE_DIRECTORIES "${OpenXR_INCLUDE_DIRS}")
endif()
add_library(OpenXR::OpenXR UNKNOWN IMPORTED)
set_target_properties(
OpenXR::OpenXR
PROPERTIES IMPORTED_LOCATION "${OpenXR_LIBRARIES}"
INTERFACE_INCLUDE_DIRECTORIES "${OpenXR_INCLUDE_DIRS}")
endif()
24 changes: 12 additions & 12 deletions code-coverage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ if(CODE_COVERAGE AND NOT CODE_COVERAGE_ADDED)
execute_process(COMMAND ${LLVM_COV_PATH} --version
OUTPUT_VARIABLE LLVM_COV_VERSION_CALL_OUTPUT)
string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" LLVM_COV_VERSION
${LLVM_COV_VERSION_CALL_OUTPUT})
${LLVM_COV_VERSION_CALL_OUTPUT})

if(LLVM_COV_VERSION VERSION_LESS "7.0.0")
message(
Expand Down Expand Up @@ -238,7 +238,7 @@ function(target_code_coverage TARGET_NAME)
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
"GNU")
target_compile_options(${TARGET_NAME} ${TARGET_VISIBILITY} -fprofile-arcs
-ftest-coverage)
-ftest-coverage)
target_link_libraries(${TARGET_NAME} ${TARGET_VISIBILITY} gcov)
endif()

Expand Down Expand Up @@ -344,8 +344,8 @@ function(target_code_coverage TARGET_NAME)
-format="html" ${EXCLUDE_REGEX}
DEPENDS ccov-processing-${target_code_coverage_COVERAGE_TARGET_NAME})

elseif(CMAKE_C_COMPILER_ID MATCHES "GNU"
OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
"GNU")
set(COVERAGE_INFO
"${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${target_code_coverage_COVERAGE_TARGET_NAME}.info"
)
Expand All @@ -359,7 +359,7 @@ function(target_code_coverage TARGET_NAME)
# Generate exclusion string for use
foreach(EXCLUDE_ITEM ${target_code_coverage_EXCLUDE})
set(EXCLUDE_REGEX ${EXCLUDE_REGEX} --remove ${COVERAGE_INFO}
'${EXCLUDE_ITEM}')
'${EXCLUDE_ITEM}')
endforeach()

if(EXCLUDE_REGEX)
Expand Down Expand Up @@ -411,8 +411,8 @@ function(target_code_coverage TARGET_NAME)
endif()
add_dependencies(ccov ccov-${target_code_coverage_COVERAGE_TARGET_NAME})

if(NOT CMAKE_C_COMPILER_ID MATCHES "GNU"
OR NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU")
if(NOT CMAKE_C_COMPILER_ID MATCHES "GNU" OR NOT CMAKE_CXX_COMPILER_ID
MATCHES "GNU")
if(NOT TARGET ccov-report)
add_custom_target(ccov-report)
endif()
Expand Down Expand Up @@ -446,8 +446,8 @@ function(add_code_coverage)
OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
add_compile_options(-fprofile-instr-generate -fcoverage-mapping)
add_link_options(-fprofile-instr-generate -fcoverage-mapping)
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU"
OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
"GNU")
add_compile_options(-fprofile-arcs -ftest-coverage)
link_libraries(gcov)
endif()
Expand Down Expand Up @@ -522,8 +522,8 @@ function(add_code_coverage_all_targets)
-format="html" ${EXCLUDE_REGEX}
DEPENDS ccov-all-processing)

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

# Nothing required for gcov
Expand All @@ -533,7 +533,7 @@ function(add_code_coverage_all_targets)
set(EXCLUDE_REGEX)
foreach(EXCLUDE_ITEM ${add_code_coverage_all_targets_EXCLUDE})
set(EXCLUDE_REGEX ${EXCLUDE_REGEX} --remove ${COVERAGE_INFO}
'${EXCLUDE_ITEM}')
'${EXCLUDE_ITEM}')
endforeach()

if(EXCLUDE_REGEX)
Expand Down

0 comments on commit 1f822d1

Please sign in to comment.