From b163b242e06c9f714b05f57f7180c760f021cbb6 Mon Sep 17 00:00:00 2001
From: "luz.paz" <luzpaz@users.noreply.github.com>
Date: Sat, 3 Feb 2018 14:58:58 +0100
Subject: Comment typo fixing.
Luzpaz went ahead and found typos using `codespell -q 3`.
---
cmake/Modules/CMakeParseArgumentsCopy.cmake | 2 +-
cmake/Modules/GrBuildTypes.cmake | 2 +-
cmake/Modules/GrMiscUtils.cmake | 4 ++--
cmake/Modules/GrSwig.cmake | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'cmake/Modules')
diff --git a/cmake/Modules/CMakeParseArgumentsCopy.cmake b/cmake/Modules/CMakeParseArgumentsCopy.cmake
index 7ce4c49ae5..66016cb2ff 100644
--- a/cmake/Modules/CMakeParseArgumentsCopy.cmake
+++ b/cmake/Modules/CMakeParseArgumentsCopy.cmake
@@ -58,7 +58,7 @@
# the new option.
# E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in
# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would
-# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor.
+# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefore.
#=============================================================================
# Copyright 2010 Alexander Neundorf <neundorf@kde.org>
diff --git a/cmake/Modules/GrBuildTypes.cmake b/cmake/Modules/GrBuildTypes.cmake
index 5789d88934..15b7339136 100644
--- a/cmake/Modules/GrBuildTypes.cmake
+++ b/cmake/Modules/GrBuildTypes.cmake
@@ -29,7 +29,7 @@ set(__INCLUDED_GR_BUILD_TYPES_CMAKE TRUE)
# - RelWithDebInfo: -O3 -g
# - MinSizeRel: -Os
-# Addtional Build Types, defined below:
+# Additional Build Types, defined below:
# - NoOptWithASM: -O0 -g -save-temps
# - O2WithASM: -O2 -g -save-temps
# - O3WithASM: -O3 -g -save-temps
diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake
index 188c40480b..94c619c2ea 100644
--- a/cmake/Modules/GrMiscUtils.cmake
+++ b/cmake/Modules/GrMiscUtils.cmake
@@ -190,7 +190,7 @@ endfunction(GR_LIBRARY_FOO)
# GR_GEN_TARGET_DEPS(unique_name target_deps <target1> <target2> ...)
# ADD_CUSTOM_COMMAND(<the usual args> ${target_deps})
#
-# Custom command cant depend on targets, but can depend on executables,
+# Custom command can't depend on targets, but can depend on executables,
# and executables can depend on targets. So this is the process:
########################################################################
function(GR_GEN_TARGET_DEPS name var)
@@ -209,7 +209,7 @@ function(GR_GEN_TARGET_DEPS name var)
endif(ARGN)
if(CMAKE_CROSSCOMPILING)
- set(${var} "DEPENDS;${name}" PARENT_SCOPE) #cant call command when cross
+ set(${var} "DEPENDS;${name}" PARENT_SCOPE) #can't call command when cross
else()
set(${var} "DEPENDS;${name};COMMAND;${name}" PARENT_SCOPE)
endif()
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake
index 0530dad80d..9fb61e2c89 100644
--- a/cmake/Modules/GrSwig.cmake
+++ b/cmake/Modules/GrSwig.cmake
@@ -35,7 +35,7 @@ include(GrPython)
function(GR_SWIG_MAKE_DOCS output_file)
if(ENABLE_DOXYGEN)
- #setup the input files variable list, quote formated
+ #setup the input files variable list, quote formatted
set(input_files)
unset(INPUT_PATHS)
foreach(input_path ${ARGN})
@@ -261,7 +261,7 @@ def get_swig_deps(file_path, level):
inc_path = os.path.join(inc_dir, inc_file)
if not os.path.exists(inc_path): continue
deps.extend(get_swig_deps(inc_path, level-1))
- break #found, we dont search in lower prio inc dirs
+ break #found, we don't search in lower prio inc dirs
return deps
if __name__ == '__main__':
--
cgit v1.2.3
From 9b58fa1a9002a468f6ddcfae0aab7afcf5891945 Mon Sep 17 00:00:00 2001
From: Andrej Rode <mail@andrejro.de>
Date: Thu, 1 Feb 2018 14:26:04 +0100
Subject: cmake: run coverage on failed tests & exclude swig generated code and
qa_*
---
CMakeLists.txt | 2 +-
cmake/Modules/CodeCoverage.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'cmake/Modules')
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5691d74176..59e3c886c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -352,7 +352,7 @@ endif()
if(${CMAKE_BUILD_TYPE} STREQUAL "Coverage")
include(CodeCoverage)
- setup_target_for_coverage(coverage "ctest" coverage)
+ setup_target_for_coverage(coverage "ctest || exit 0" coverage)
endif()
diff --git a/cmake/Modules/CodeCoverage.cmake b/cmake/Modules/CodeCoverage.cmake
index a0b0ef5269..0659f168d6 100644
--- a/cmake/Modules/CodeCoverage.cmake
+++ b/cmake/Modules/CodeCoverage.cmake
@@ -146,7 +146,7 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
# Capturing lcov counters and generating report
COMMAND ${LCOV_PATH} --directory . --capture --output-file ${coverage_info}
- COMMAND ${LCOV_PATH} --remove ${coverage_info} 'tests/*' '/usr/*' --output-file ${coverage_cleaned}
+ COMMAND ${LCOV_PATH} --remove ${coverage_info} 'tests/*' '/usr/*' 'swig/*' '*/swig/*' '*/qa_*' --output-file ${coverage_cleaned}
COMMAND ${GENHTML_PATH} -o ${_outputname} ${coverage_cleaned}
COMMAND ${CMAKE_COMMAND} -E remove ${coverage_info} ${coverage_cleaned}
--
cgit v1.2.3
From 7365f030cdc690c00a0cd7d2dc418275495243e9 Mon Sep 17 00:00:00 2001
From: Andrej Rode <mail@andrejro.de>
Date: Thu, 1 Feb 2018 15:29:08 +0100
Subject: cmake: dont remove coverage fragments
---
cmake/Modules/CodeCoverage.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmake/Modules')
diff --git a/cmake/Modules/CodeCoverage.cmake b/cmake/Modules/CodeCoverage.cmake
index 0659f168d6..4e96e3b3f9 100644
--- a/cmake/Modules/CodeCoverage.cmake
+++ b/cmake/Modules/CodeCoverage.cmake
@@ -148,7 +148,7 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
COMMAND ${LCOV_PATH} --directory . --capture --output-file ${coverage_info}
COMMAND ${LCOV_PATH} --remove ${coverage_info} 'tests/*' '/usr/*' 'swig/*' '*/swig/*' '*/qa_*' --output-file ${coverage_cleaned}
COMMAND ${GENHTML_PATH} -o ${_outputname} ${coverage_cleaned}
- COMMAND ${CMAKE_COMMAND} -E remove ${coverage_info} ${coverage_cleaned}
+ # Don't remove fragments so CI can upload them to codecov
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
--
cgit v1.2.3