From dcb1f64f373f9d10b2b884e623b4f07c9044a804 Mon Sep 17 00:00:00 2001 From: youhy Date: Wed, 13 Jul 2022 14:04:39 -0700 Subject: [PATCH 1/5] add code coverage ignore file Signed-off-by: youhy --- CMakeLists.txt | 2 ++ coverage.ignore.in | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 coverage.ignore.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 37d76bd93..5f8d03ee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,6 +118,8 @@ message(STATUS "-------------------------------------------\n") #============================================================================ configure_file("${PROJECT_SOURCE_DIR}/cppcheck.suppress.in" ${PROJECT_BINARY_DIR}/cppcheck.suppress) +configure_file("${PROJECT_SOURCE_DIR}/coverage.ignore.in" + ${PROJECT_BINARY_DIR}/coverage.ignore) ign_configure_build(QUIT_IF_BUILD_ERRORS COMPONENTS av events graphics profiler) diff --git a/coverage.ignore.in b/coverage.ignore.in new file mode 100644 index 000000000..8d8c50094 --- /dev/null +++ b/coverage.ignore.in @@ -0,0 +1,3 @@ +profiler/src/Remotery/lib/* +profiler/src/Remotery/vis/* +graphics/src/tiny_obj_loader.h From 78b42ec2b559a1a5602c6e2a0f0465aaf1282846 Mon Sep 17 00:00:00 2001 From: youhy Date: Mon, 18 Jul 2022 12:44:14 -0700 Subject: [PATCH 2/5] ignore all src files without 'Open Source Robotics Foundation' Signed-off-by: youhy --- coverage.ignore.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/coverage.ignore.in b/coverage.ignore.in index 8d8c50094..467eeb6fb 100644 --- a/coverage.ignore.in +++ b/coverage.ignore.in @@ -1,3 +1,12 @@ profiler/src/Remotery/lib/* profiler/src/Remotery/vis/* graphics/src/tiny_obj_loader.h +av/include/ignition/common/HWVideo.hh +av/include/ignition/common/HWEncoder.hh +av/src/HWEncoder.cc +include/ignition/common/FlagSet.hh +src/FilesystemBoost.cc +src/win_dirent.h +examples/assert_example.cc +graphics/src/tinyxml2/tinyxml2.h +graphics/src/tinyxml2/tinyxml2.cpp From c36ceb070eb2bcb723d94a334897e40ee57aa22e Mon Sep 17 00:00:00 2001 From: youhy Date: Fri, 22 Jul 2022 13:57:41 -0700 Subject: [PATCH 3/5] remove non vendor code from the ignore list Signed-off-by: youhy --- coverage.ignore.in | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/coverage.ignore.in b/coverage.ignore.in index 467eeb6fb..07d2fafbb 100644 --- a/coverage.ignore.in +++ b/coverage.ignore.in @@ -1,12 +1,4 @@ -profiler/src/Remotery/lib/* -profiler/src/Remotery/vis/* +profiler/src/Remotery/* graphics/src/tiny_obj_loader.h -av/include/ignition/common/HWVideo.hh -av/include/ignition/common/HWEncoder.hh -av/src/HWEncoder.cc -include/ignition/common/FlagSet.hh -src/FilesystemBoost.cc src/win_dirent.h -examples/assert_example.cc -graphics/src/tinyxml2/tinyxml2.h -graphics/src/tinyxml2/tinyxml2.cpp +graphics/src/tinyxml2/* From dd5da6fb70c4eafc22a44e67ee7fb236c052dbea Mon Sep 17 00:00:00 2001 From: youhy Date: Mon, 25 Jul 2022 13:10:53 -0700 Subject: [PATCH 4/5] remove configure_file Signed-off-by: youhy --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f8d03ee3..37d76bd93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,8 +118,6 @@ message(STATUS "-------------------------------------------\n") #============================================================================ configure_file("${PROJECT_SOURCE_DIR}/cppcheck.suppress.in" ${PROJECT_BINARY_DIR}/cppcheck.suppress) -configure_file("${PROJECT_SOURCE_DIR}/coverage.ignore.in" - ${PROJECT_BINARY_DIR}/coverage.ignore) ign_configure_build(QUIT_IF_BUILD_ERRORS COMPONENTS av events graphics profiler) From a54a6dac0184f876d3b1807cf752b36df85ae208 Mon Sep 17 00:00:00 2001 From: youhy Date: Tue, 26 Jul 2022 12:43:55 -0700 Subject: [PATCH 5/5] update gz-cmake version required to 2.14 Signed-off-by: youhy --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37d76bd93..0ad745b2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(ignition-common3 VERSION 3.14.1) #============================================================================ # Find ignition-cmake #============================================================================ -find_package(ignition-cmake2 2.8.0 REQUIRED COMPONENTS utilities) +find_package(ignition-cmake2 2.14.0 REQUIRED COMPONENTS utilities) set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR}) #============================================================================