From ee09bc6e6bef6ca9e1e35a401e311a509ca1543a Mon Sep 17 00:00:00 2001 From: youhy Date: Tue, 19 Jul 2022 14:39:54 -0700 Subject: [PATCH 1/4] add code coverage ignore file Signed-off-by: youhy --- CMakeLists.txt | 3 ++- coverage.ignore.in | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 coverage.ignore.in diff --git a/CMakeLists.txt b/CMakeLists.txt index c22e27559..ebedd8b0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,8 @@ set(IGNITION_PHYSICS_ENGINE_INSTALL_DIR #============================================================================ ign_configure_build(QUIT_IF_BUILD_ERRORS COMPONENTS sdf mesh dartsim tpe) - +configure_file("${PROJECT_SOURCE_DIR}/coverage.ignore.in" + ${PROJECT_BINARY_DIR}/coverage.ignore) #============================================================================ # Create package information diff --git a/coverage.ignore.in b/coverage.ignore.in new file mode 100644 index 000000000..9e3beb08f --- /dev/null +++ b/coverage.ignore.in @@ -0,0 +1,2 @@ +tpe/lib/src/aabb_tree/AABB.h +tpe/lib/src/aabb_tree/AABB.cc From ee2e6d9505759ca652e39c0681d871ce7936d02e Mon Sep 17 00:00:00 2001 From: Jenn Nguyen Date: Fri, 22 Jul 2022 14:29:45 -0700 Subject: [PATCH 2/4] moved configure_file before configure_build Signed-off-by: Jenn Nguyen --- CMakeLists.txt | 4 ++-- coverage.ignore.in | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebedd8b0d..3e77a24b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,10 +86,10 @@ set(IGNITION_PHYSICS_ENGINE_INSTALL_DIR #============================================================================ # Configure the build #============================================================================ -ign_configure_build(QUIT_IF_BUILD_ERRORS - COMPONENTS sdf mesh dartsim tpe) configure_file("${PROJECT_SOURCE_DIR}/coverage.ignore.in" ${PROJECT_BINARY_DIR}/coverage.ignore) +ign_configure_build(QUIT_IF_BUILD_ERRORS + COMPONENTS sdf mesh dartsim tpe) #============================================================================ # Create package information diff --git a/coverage.ignore.in b/coverage.ignore.in index 9e3beb08f..6e424a8a1 100644 --- a/coverage.ignore.in +++ b/coverage.ignore.in @@ -1,2 +1 @@ -tpe/lib/src/aabb_tree/AABB.h -tpe/lib/src/aabb_tree/AABB.cc +tpe/lib/src/aabb_tree/* From d2f284f998f4191a0587213c69bbd9eebb67cb22 Mon Sep 17 00:00:00 2001 From: youhy Date: Mon, 25 Jul 2022 13:09:52 -0700 Subject: [PATCH 3/4] remove configure_file Signed-off-by: youhy --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e77a24b8..d6f38ab04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,8 +86,6 @@ set(IGNITION_PHYSICS_ENGINE_INSTALL_DIR #============================================================================ # Configure the build #============================================================================ -configure_file("${PROJECT_SOURCE_DIR}/coverage.ignore.in" - ${PROJECT_BINARY_DIR}/coverage.ignore) ign_configure_build(QUIT_IF_BUILD_ERRORS COMPONENTS sdf mesh dartsim tpe) From fbd3d3157d5b46fbfee1c5f346e8d744bd3301c7 Mon Sep 17 00:00:00 2001 From: youhy Date: Tue, 26 Jul 2022 12:38:13 -0700 Subject: [PATCH 4/4] update gz-cmake version required to 2.14 Signed-off-by: youhy --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6f38ab04..6f9e2addc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(ignition-physics2 VERSION 2.5.0) #============================================================================ # Find ignition-cmake #============================================================================ -find_package(ignition-cmake2 2.12.0 REQUIRED) +find_package(ignition-cmake2 2.14.0 REQUIRED) #============================================================================ # Configure the project @@ -89,6 +89,7 @@ set(IGNITION_PHYSICS_ENGINE_INSTALL_DIR ign_configure_build(QUIT_IF_BUILD_ERRORS COMPONENTS sdf mesh dartsim tpe) + #============================================================================ # Create package information #============================================================================