Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
99b7bd7
Update OctoMap to latest release (1.10.0)
mwoehlke-kitware Jan 26, 2026
444d2da
Correct uninitialized local variable
SeanCurtis-TRI Jan 26, 2026
6569bef
Unused variable
SeanCurtis-TRI Jan 27, 2026
417a030
Temporarily disable Debug build
SeanCurtis-TRI Jan 27, 2026
c55b685
Undo a bad "using std::move" -- made clang angry.
SeanCurtis-TRI Jan 27, 2026
b4896e9
Restore debug build to linux CI
SeanCurtis-TRI Jan 27, 2026
9c9b6be
Build octomap with in common release with FCL
SeanCurtis-TRI Jan 27, 2026
17ecab9
Apparently mac needs to be told to use modern C++
SeanCurtis-TRI Jan 27, 2026
e5f9ab8
Possibly correct yaml
SeanCurtis-TRI Jan 28, 2026
392c76f
Merge branch 'master' into update-octomap
SeanCurtis-TRI Jan 28, 2026
94877e9
Trying to clean up yaml....again
SeanCurtis-TRI Jan 28, 2026
9305217
Tweak workflow inputs
SeanCurtis-TRI Jan 28, 2026
4717839
Revert efforts to tweak build parameters
SeanCurtis-TRI Jan 28, 2026
87ce109
Missed part of the reversion
SeanCurtis-TRI Jan 28, 2026
277a5a5
Small convenience tweaks
SeanCurtis-TRI Jan 28, 2026
bfe49eb
Advance C++ standard to 17
SeanCurtis-TRI Jan 28, 2026
fc94947
Merge branch 'master' into update-octomap
SeanCurtis-TRI Jan 28, 2026
8a56785
Upgrade mac to 15 (sequoia)
SeanCurtis-TRI Jan 28, 2026
ce8f417
When building octomap on apple, don't let warnings be errors
SeanCurtis-TRI Jan 28, 2026
ec3fb40
Second attempt at disabling warning/error
SeanCurtis-TRI Jan 28, 2026
de01c87
Silence all the warnings
SeanCurtis-TRI Jan 28, 2026
b514f02
Octomap triggers AppleClang warnings
SeanCurtis-TRI Jan 28, 2026
4ad757c
More tweaks to octomap build
SeanCurtis-TRI Jan 28, 2026
557afe2
Back mac back down to 14...
SeanCurtis-TRI Jan 28, 2026
cab7a6a
Restore osx15 and pin to eigen 3.4.0
SeanCurtis-TRI Jan 28, 2026
d4267e2
Patch brew rcipe
SeanCurtis-TRI Jan 28, 2026
479c1ff
Adapting to mac CI failure
SeanCurtis-TRI Jan 29, 2026
c603a12
Remove mac entirely
SeanCurtis-TRI Jan 29, 2026
79d241d
Oops...took too much away.
SeanCurtis-TRI Jan 29, 2026
f6548c5
Upgrade windows to use eigen compatible with c++ 17
SeanCurtis-TRI Jan 29, 2026
3aa2d31
Eigen 3.4.1 may have been too aggressive for windows
SeanCurtis-TRI Jan 29, 2026
a696435
More windows accommodation
SeanCurtis-TRI Jan 29, 2026
66f8421
Windows grousing
SeanCurtis-TRI Jan 29, 2026
2eb90bf
Leave windows alone
SeanCurtis-TRI Feb 2, 2026
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
7 changes: 5 additions & 2 deletions ci/install_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ sudo apt-get -qq --yes --force-yes install libccd-dev
# Octomap
git clone https://github.com/OctoMap/octomap
cd octomap
git checkout tags/v1.8.0
git checkout tags/v1.10.0
mkdir build
cd build
cmake ..
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_POLICY_VERSION_MINIMUM=3.10 \
..
make
sudo make install
7 changes: 5 additions & 2 deletions ci/install_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ brew install libccd
# Octomap
git clone https://github.com/OctoMap/octomap
cd octomap
git checkout tags/v1.8.0
git checkout tags/v1.10.0
mkdir build
cd build
cmake ..
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_POLICY_VERSION_MINIMUM=3.10 \
..
make
sudo make install
4 changes: 0 additions & 4 deletions include/fcl/math/geometry-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,6 @@ void eigen_old(const Matrix3<S>& m, Vector3<S>& dout, Matrix3<S>& vout)
int n = 3;
int j, iq, ip, i;
S tresh, theta, tau, t, sm, s, h, g, c;
int nrot;
S b[3];
S z[3];
S v[3][3] = {{1, 0, 0}, {0, 1, 0}, {0, 0, 1}};
Expand All @@ -492,8 +491,6 @@ void eigen_old(const Matrix3<S>& m, Vector3<S>& dout, Matrix3<S>& vout)
z[ip] = 0;
}

nrot = 0;

for(i = 0; i < 50; ++i)
{
sm = 0;
Expand Down Expand Up @@ -544,7 +541,6 @@ void eigen_old(const Matrix3<S>& m, Vector3<S>& dout, Matrix3<S>& vout)
for(j = ip + 1; j < iq; ++j) { g = R(ip, j); h = R(j, iq); R(ip, j) = g - s * (h + g * tau); R(j, iq) = h + s * (g - h * tau); }
for(j = iq + 1; j < n; ++j) { g = R(ip, j); h = R(iq, j); R(ip, j) = g - s * (h + g * tau); R(iq, j) = h + s * (g - h * tau); }
for(j = 0; j < n; ++j) { g = v[j][ip]; h = v[j][iq]; v[j][ip] = g - s * (h + g * tau); v[j][iq] = h + s * (g - h * tau); }
nrot++;
}
}
}
Expand Down
Loading