Skip to content

Commit d30c34c

Browse files
authored
Merge pull request #53 from Space-Systems/correct-build-typo
Fixes in build.sh
2 parents 2613e61 + c205206 commit d30c34c

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

build.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ git submodule update --init --recursive
2020
# #
2121
################################################################################
2222
# Build OPI
23-
cd OPI || exit || exit
23+
cd OPI || exit
2424
# Create the build directory if it does not exist
2525
if [[ ! -d "build" ]]; then
2626
mkdir build
2727
else
2828
rm -rf build/*
2929
fi
30-
cd build || exit || exit
30+
cd build || exit
3131
echo "Updating cmake"
3232
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=../ -DCMAKE_Fortran_COMPILER=$Fortran_COMPILER -DENABLE_CXX11=ON -DENABLE_CL_SUPPORT=OFF -DENABLE_CUDA_SUPPORT=OFF -DENABLE_PYTHON=OFF ../
3333
echo "Building OPI"
@@ -44,14 +44,14 @@ cd ../../
4444
# #
4545
################################################################################
4646
# Build libslam
47-
cd libslam || exit || exit
47+
cd libslam || exit
4848
# Create the build directory if it does not exist
4949
if [[ ! -d "build" ]]; then
5050
mkdir build
5151
else
5252
rm -rf build/*
5353
fi
54-
cd build || exit || exit
54+
cd build || exit
5555
echo "Updating cmake"
5656
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_Fortran_COMPILER=$Fortran_COMPILER -DENABLE_OpenMP_SUPPORT=OFF -DENABLE_POSTGRESQL_SUPPORT=OFF ../
5757
echo "Building libslam"
@@ -98,7 +98,7 @@ if [[ ! -d "lib" ]]; then
9898
mkdir lib
9999
fi
100100
# Create the links to libraries needed by CAMP
101-
cd lib || exit || exit
101+
cd lib || exit
102102
ln -sf ../libslam/lib/libslam-Fortran.$LIBSUFFIX .
103103
ln -sf ../OPI/lib/libOPI-Fortran.$LIBSUFFIX .
104104
ln -sf ../OPI/lib/libOPI.$LIBSUFFIX .
@@ -108,7 +108,7 @@ if [[ ! -d "include" ]]; then
108108
mkdir include
109109
fi
110110
# Create the links to includes needed by NEPTUNE
111-
cd include || exit || exit
111+
cd include || exit
112112
ln -sf ../libslam/include/SLAM .
113113
ln -sf ../OPI/include/OPI .
114114
cd ..
@@ -118,7 +118,7 @@ if [[ ! -d "build" ]]; then
118118
else
119119
rm -rf build/*
120120
fi
121-
cd build || exit || exit
121+
cd build || exit
122122
echo "Updating cmake"
123123
export PFUNIT_DIR=..//pFUnit/build/installed
124124
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_Fortran_COMPILER=$Fortran_COMPILER -DENABLE_OPI_SUPPORT=ON -DSKIP_MSIS_2=ON ../
@@ -129,7 +129,7 @@ if [[ $? -ne 0 ]]; then
129129
exit $?
130130
fi
131131
echo "Leaving NEPTUNE"
132-
cd ../work || exit || exit
133-
ln -sf ../bin/neptune-sa . .
132+
cd ../work || exit
133+
ln -sf ../bin/neptune-sa .
134134
cd ..
135135
echo "Done"

0 commit comments

Comments
 (0)