Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Ubuntu Jammy release build #935

Merged
merged 1 commit into from
Sep 6, 2023
Merged

Fix Ubuntu Jammy release build #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Lint (CodeCov) | [![Build Status](https://github.com/tesseract-robotics/te
The planning framework (Tesseract) was designed to be light weight, limiting the number of dependencies, mainly only using standard libraries like, eigen, boost, orocos and to the packages below. The core packages are ROS agnostic and have full python support.

## Dependencies
[![ros_industrial_cmake_boilerplate](https://img.shields.io/badge/ros_industrial_cmake_boilerplate-0.4.7-brightgreen)](https://github.com/ros-industrial/ros_industrial_cmake_boilerplate/tree/0.4.7)
[![ros_industrial_cmake_boilerplate](https://img.shields.io/badge/ros_industrial_cmake_boilerplate-0.5.3-brightgreen)](https://github.com/ros-industrial/ros_industrial_cmake_boilerplate/tree/0.5.3)
[![opw_kinematics](https://img.shields.io/badge/opw_kinematics-0.5.0-brightgreen)](https://github.com/Jmeyer1292/opw_kinematics/tree/0.5.0)

## Tesseract Setup Wizard and Visualization Tools
Expand Down
4 changes: 4 additions & 0 deletions tesseract_collision/bullet/src/tesseract_compound_collision_algorithm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
#include <tesseract_collision/core/types.h>

// LCOV_EXCL_START
// See tesseract issue: https://github.com/tesseract-robotics/tesseract/issues/934
TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
namespace tesseract_collision::tesseract_collision_bullet
{
TesseractCompoundCollisionAlgorithm::TesseractCompoundCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci,
Expand Down Expand Up @@ -295,6 +297,7 @@ void TesseractCompoundCollisionAlgorithm::processCollision(const btCollisionObje
{
if (m_childCollisionAlgorithms[i] != nullptr)
{
// See tesseract issue: https://github.com/tesseract-robotics/tesseract/issues/934
m_childCollisionAlgorithms[i]->getAllContactManifolds(manifoldArray);
for (int m = 0; m < manifoldArray.size(); m++)
{
Expand Down Expand Up @@ -422,4 +425,5 @@ btScalar TesseractCompoundCollisionAlgorithm::calculateTimeOfImpact(btCollisionO
return hitFraction;
}
} // namespace tesseract_collision::tesseract_collision_bullet
TESSERACT_COMMON_IGNORE_WARNINGS_POP
// LCOV_EXCL_STOP
3 changes: 3 additions & 0 deletions tesseract_collision/bullet/src/tesseract_compound_compound_collision_algorithm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
#include <tesseract_collision/core/types.h>

// LCOV_EXCL_START
// See tesseract issue: https://github.com/tesseract-robotics/tesseract/issues/934
TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
namespace tesseract_collision::tesseract_collision_bullet
{
TesseractCompoundCompoundCollisionAlgorithm::TesseractCompoundCompoundCollisionAlgorithm(
Expand Down Expand Up @@ -459,4 +461,5 @@ btScalar TesseractCompoundCompoundCollisionAlgorithm::calculateTimeOfImpact(btCo
return btScalar(0);
}
} // namespace tesseract_collision::tesseract_collision_bullet
TESSERACT_COMMON_IGNORE_WARNINGS_POP
// LCOV_EXCL_STOP
3 changes: 2 additions & 1 deletion tesseract_common/include/tesseract_common/macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
_Pragma("GCC diagnostic ignored \"-Wunused-variable\"") \
_Pragma("GCC diagnostic ignored \"-Wclass-memaccess\"") \
_Pragma("GCC diagnostic ignored \"-Wsign-conversion\"") \
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
_Pragma("GCC diagnostic ignored \"-Wstringop-overflow\"") \
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
#endif

#define TESSERACT_COMMON_IGNORE_WARNINGS_POP _Pragma("GCC diagnostic pop")
Expand Down
Loading