diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:15 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:43 +0100 |
| commit | db7e26bc73fd71bc88249131f57f7edef308fa63 (patch) | |
| tree | d084ad2615012d53c50a230821761349eb978d56 /cmake | |
| parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
| parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/CMakeParseArgumentsCopy.cmake | 2 | ||||
| -rw-r--r-- | cmake/Modules/CodeCoverage.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/GrBuildTypes.cmake | 2 | ||||
| -rw-r--r-- | cmake/Modules/GrMiscUtils.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 4 | ||||
| -rw-r--r-- | cmake/msvc/sys/time.h | 2 |
6 files changed, 9 insertions, 9 deletions
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/CodeCoverage.cmake b/cmake/Modules/CodeCoverage.cmake index a0b0ef5269..4e96e3b3f9 100644 --- a/cmake/Modules/CodeCoverage.cmake +++ b/cmake/Modules/CodeCoverage.cmake @@ -146,9 +146,9 @@ 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} + # 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." 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 b158a08d07..79bb70c03e 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -185,7 +185,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) @@ -204,7 +204,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 de8be5cc19..0115c4da98 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}) @@ -258,7 +258,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__': diff --git a/cmake/msvc/sys/time.h b/cmake/msvc/sys/time.h index 12acc8dc31..dca0fdf51b 100644 --- a/cmake/msvc/sys/time.h +++ b/cmake/msvc/sys/time.h @@ -7,7 +7,7 @@ //http://social.msdn.microsoft.com/Forums/en/vcgeneral/thread/430449b3-f6dd-4e18-84de-eebd26a8d668 #include < time.h > -#include <windows.h> //I've ommited this line. +#include <windows.h> //I've omitted this line. #if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 #else |