Skip to content

Moves libdwarf, libdw and binutils in as dependencies #2927

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

Merged
merged 4 commits into from
Jun 5, 2025
+5 −4
Merged

Moves libdwarf, libdw and binutils in as dependencies #2927

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
602d116
Moves libdwarf, libdw and binutils in as dependencies
arjo129 May 28, 2025
1f7f7d4
Merge branch 'main' into arjo/feat/add_dwarf_dep
arjo129 Jun 2, 2025
a2098ad
Fix bug returning nullptr in a string return type
j-rivero Jun 4, 2025
6c4cef9
Merge branch 'main' into arjo/feat/add_dwarf_dep
j-rivero Jun 5, 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
3 changes: 3 additions & 0 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
binutils-dev
freeglut3-dev
libbenchmark-dev
libdwarf-dev
libdw-dev
libfreeimage-dev
libglew-dev
libgz-cmake5-dev
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
with:
# per bug https://github.com/gazebosim/gz-sim/issues/1409
cmake-args: '-DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DOCS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo'
apt-dependencies: libdwarf-dev libdw-dev binutils-dev

noble-ci-disable-gui:
runs-on: ubuntu-latest
Expand All @@ -46,4 +45,3 @@ jobs:
with:
# per bug https://github.com/gazebosim/gz-sim/issues/1409
cmake-args: '-DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DOCS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_GUI=OFF'
apt-dependencies: libdwarf-dev libdw-dev binutils-dev
4 changes: 2 additions & 2 deletions src/gui/Gui.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ std::string defaultGuiConfigFile(bool _isPlayback,
{
gzerr << "Failed to create the default config folder ["
<< defaultConfigFolder << "]\n";
return nullptr;
return "";
}
}

Expand All @@ -217,7 +217,7 @@ std::string defaultGuiConfigFile(bool _isPlayback,
gzerr << "Failed to copy installed config [" << installedConfig
<< "] to default config [" << defaultConfig << "]."
<< std::endl;
return nullptr;
return "";
}
else
{
Expand Down