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

arch.sh: get rid of ignition-cmake workaround #13256

Merged
merged 1 commit into from
Oct 24, 2019
Merged

arch.sh: get rid of ignition-cmake workaround #13256

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 1 addition & 11 deletions Tools/setup/arch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ if [[ $INSTALL_SIM == "true" ]]; then
# Gazebo setup
if [[ $INSTALL_GAZEBO == "true" ]]; then
echo
echo "Installing gazebo and dependencies for PX4 simulation"
echo "Installing gazebo and dependencies for PX4 gazebo simulation"

# PX4 gazebo simulation dependencies
sudo pacman -S --noconfirm --needed \
Expand All @@ -143,16 +143,6 @@ if [[ $INSTALL_SIM == "true" ]]; then
# install gazebo from AUR
yay -S gazebo --noconfirm

# fix incompatible compile flag to disable default testing that leads to build error
# see https://bitbucket.org/ignitionrobotics/ign-cmake/issues/62/compilation-failing-when-performing
pushd ~/.cache/yay/ignition-cmake/
sed -i 's/-DENABLE_TESTS_COMPILATION:BOOL=False/-DBUILD_TESTING=OFF/g' PKGBUILD
makepkg -si --noconfirm
popd

# continue installing gezebo
yay -S gazebo --noconfirm

if sudo dmidecode -t system | grep -q "Manufacturer: VMware, Inc." ; then
# fix VMWare 3D graphics acceleration for gazebo
echo "export SVGA_VGPU10=0" >> ~/.profile
Expand Down