Skip to content

Upgrade CI to newer os version #635

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Upgrade CI to newer os version #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1f3377
Upgrade CI to newer os version
SeanCurtis-TRI Mar 12, 2025
9a80497
ubuntu 24 and 22 are not octomap compatible
SeanCurtis-TRI Mar 12, 2025
102c0ad
Try setting the macosx_rpath explicitly
SeanCurtis-TRI Mar 12, 2025
b8e1e60
Try setting Cmake's INSTALL_NAME_DIR
SeanCurtis-TRI Mar 12, 2025
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 .github/workflows/all_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
matrix:
compiler: [clang]
build: [Release, Debug]
os: ['macos-11']
os: ['macos-latest']
uses: ./.github/workflows/generic_ci.yml
with:
install-name: 'install_osx.sh'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generic_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: mkdir ${{github.workspace}}/build

- name: Configure CMake
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ inputs.build }} -DFCL_TREAT_WARNINGS_AS_ERRORS=ON -DFCL_COVERALLS=OFF
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ inputs.build }} -DFCL_TREAT_WARNINGS_AS_ERRORS=ON -DFCL_COVERALLS=OFF -DCMAKE_INSTALL_NAME_DIR=/usr/local/lib

- name: Build
run: cmake --build build -j2
Expand Down
4 changes: 0 additions & 4 deletions include/fcl/math/geometry-inl.h
View file
Open in desktop
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
5 changes: 5 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
VERSION ${FCL_VERSION}
SOVERSION ${FCL_ABI_VERSION})

if (NOT UNIX)
set_target_properties(${PROJECT_NAME} PROPERTIES
INSTALL_NAME_DIR "@rpath")
endif()

# Hide symbols by default
#################################################
# Macro to check for visibility capability in compiler
Expand Down
Loading