mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-06-01 02:55:07 +08:00
arch.sh: get rid of ignition-cmake workaround
The AUR repository got fixed upstream after I reported the issue. I tested on a fresh machine so we can get rid of the workaround that was necessary. See https://aur.archlinux.org/packages/ignition-cmake/#comment-712301
This commit is contained in:
committed by
Julian Oes
parent
1d44231cd4
commit
f317d227ef
+1
-11
@@ -125,7 +125,7 @@ if [[ $INSTALL_SIM == "true" ]]; then
|
|||||||
# Gazebo setup
|
# Gazebo setup
|
||||||
if [[ $INSTALL_GAZEBO == "true" ]]; then
|
if [[ $INSTALL_GAZEBO == "true" ]]; then
|
||||||
echo
|
echo
|
||||||
echo "Installing gazebo and dependencies for PX4 simulation"
|
echo "Installing gazebo and dependencies for PX4 gazebo simulation"
|
||||||
|
|
||||||
# PX4 gazebo simulation dependencies
|
# PX4 gazebo simulation dependencies
|
||||||
sudo pacman -S --noconfirm --needed \
|
sudo pacman -S --noconfirm --needed \
|
||||||
@@ -143,16 +143,6 @@ if [[ $INSTALL_SIM == "true" ]]; then
|
|||||||
# install gazebo from AUR
|
# install gazebo from AUR
|
||||||
yay -S gazebo --noconfirm
|
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
|
if sudo dmidecode -t system | grep -q "Manufacturer: VMware, Inc." ; then
|
||||||
# fix VMWare 3D graphics acceleration for gazebo
|
# fix VMWare 3D graphics acceleration for gazebo
|
||||||
echo "export SVGA_VGPU10=0" >> ~/.profile
|
echo "export SVGA_VGPU10=0" >> ~/.profile
|
||||||
|
|||||||
Reference in New Issue
Block a user