Skip to content

Commit

Permalink
fixed Eigen issue on existing installations
Browse files Browse the repository at this point in the history
  • Loading branch information
sytelus committed Jul 19, 2017
1 parent 0c87453 commit 1b48297
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
12 changes: 8 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
pushd "$SCRIPT_DIR"

set -e
set +x
set -x

# update any git submodules, currently rpclib
git submodule update --init --recursive
Expand Down Expand Up @@ -78,16 +78,20 @@ rsync -a --delete AirLib Unreal/Plugins/AirSim/Source
Unreal/Environments/Blocks/clean.sh
rsync -a --delete Unreal/Plugins Unreal/Environments/Blocks

set +x

echo ""
echo ""
echo "=================================================================="
echo " AirSim plugin is build! Here's how to build Unreal project."
echo "=================================================================="
echo "If you are using Blocks environment, its already updated."
echo "If you are using your own environment, update blugin with this:"
echo "If you are using your own environment, update plugin using,"
echo "rsync -t -r Unreal/Plugins path/to/MyUnrealProject"
echo ""
echo "For help see https://github.com/Microsoft/AirSim/blob/master/docs/linux_build.md"
echo "For help see:"
echo "https://github.com/Microsoft/AirSim/blob/master/docs/linux_build.md"
echo "=================================================================="


popd
popd
12 changes: 8 additions & 4 deletions setup.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/bash

set +x
set -x
set -e

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand All @@ -27,7 +27,7 @@ else
fi

#build libc++
rm -rf llvm-build
sudo rm -rf llvm-build
mkdir llvm-build && cd llvm-build

export C_COMPILER=clang-3.9
Expand All @@ -44,7 +44,7 @@ make cxx
sudo make install-libcxx install-libcxxabi

#install EIGEN library
if [[ -z "${EIGEN_ROOT}" ]]; then
if [[ -z "${EIGEN_ROOT}" ]] || [[ ! -d eigen ]]; then
echo "EIGEN_ROOT variable is not set"
if [[ ! -d eigen ]]; then
echo "downloading eigen..."
Expand All @@ -60,4 +60,8 @@ fi

popd


set +x
echo ""
echo "************************************"
echo "AirSim setup completed successfully!"
echo "************************************"

0 comments on commit 1b48297

Please sign in to comment.