Skip to content

Commit d571175

Browse files
committed
more indentation
1 parent 13cf840 commit d571175

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

.travis.yml

+26-26
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ before_script:
104104
- export CPPCHECK=${CPPCHECK:-false}
105105
- >
106106
if [[ "$TRAVIS_OS_NAME" == "osx" ]] && ! $NOF77; then
107-
brew update;
108-
brew install bash gcc metis hwloc;
109-
$SINGLEPRECISION && brew install lapack;
110-
if [[ "$OSX" == 10.14 ]] ; then export CC=gcc-11 ; export CXX=g++-11 ;
111-
elif [[ "$OSX" == 10.15 ]] ; then export CC=gcc-11 ; export CXX=g++-11 ;
112-
elif [[ "$OSX" == 11 ]] ; then export CC=gcc-11 ; export CXX=g++-11 ; fi ;
113-
$CC --version; $CXX --version; gfortran --version;
107+
brew update;
108+
brew install bash gcc metis hwloc;
109+
$SINGLEPRECISION && brew install lapack;
110+
if [[ "$OSX" == 10.14 ]] ; then export CC=gcc-11 ; export CXX=g++-11 ;
111+
elif [[ "$OSX" == 10.15 ]] ; then export CC=gcc-11 ; export CXX=g++-11 ;
112+
elif [[ "$OSX" == 11 ]] ; then export CC=gcc-11 ; export CXX=g++-11 ; fi ;
113+
$CC --version; $CXX --version; gfortran --version;
114114
fi ;
115115
if [[ "$TRAVIS_OS_NAME" == "freebsd" ]] ; then
116116
export CC=gcc ; export CXX=g++ ;
@@ -121,30 +121,30 @@ script:
121121
# macOS VecLib doesn't work for single-precision routines (https://github.com/mcg1969/vecLibFort) - use homebrew lapack instead
122122
- >
123123
if $NOF77 || $SINGLEPRECISION || $INT64 ; then
124-
echo "Skipping Spral build." ;
124+
echo "Skipping Spral build." ;
125125
else
126-
git clone --depth 1 --branch master https://github.com/ralna/spral.git &&
127-
pushd spral &&
128-
./autogen.sh &&
129-
if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
130-
CFLAGS=-fPIC CXXFLAGS=-fPIC FFLAGS=-fPIC FCFLAGS=-fPIC ./configure --prefix ${HOME}/spral --with-metis="-L/usr/local/Cellar/metis/5.1.0/lib -lmetis" --with-metic-inc-dir=/usr/local/Cellar/metis/5.1.0/include ;
131-
else
132-
CFLAGS=-fPIC CXXFLAGS=-fPIC FFLAGS=-fPIC FCFLAGS=-fPIC ./configure --prefix ${HOME}/spral ;
133-
fi &&
134-
make install &&
135-
popd ;
126+
git clone --depth 1 --branch master https://github.com/ralna/spral.git &&
127+
pushd spral &&
128+
./autogen.sh &&
129+
if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
130+
CFLAGS=-fPIC CXXFLAGS=-fPIC FFLAGS=-fPIC FCFLAGS=-fPIC ./configure --prefix ${HOME}/spral --with-metis="-L/usr/local/Cellar/metis/5.1.0/lib -lmetis" --with-metic-inc-dir=/usr/local/Cellar/metis/5.1.0/include ;
131+
else
132+
CFLAGS=-fPIC CXXFLAGS=-fPIC FFLAGS=-fPIC FCFLAGS=-fPIC ./configure --prefix ${HOME}/spral ;
133+
fi &&
134+
make install &&
135+
popd ;
136136
fi
137137
- >
138138
mkdir -p $HOME/install/share && touch $HOME/install/share/config.site ;
139139
( $NOF77 && echo enable_f77=no ;
140-
$ENABLEDEBUG && ( echo enable_debug=yes ; echo with_ipopt_checklevel=5 ; echo with_ipopt_verbosity=5 ) ;
141-
$SINGLEPRECISION && echo "with_precision=single" ;
142-
$SINGLEPRECISION && [[ "$TRAVIS_OS_NAME" == "osx" ]] && ! $NOF77 && echo "with_lapack=\"-L/usr/local/opt/lapack/lib -llapack -lblas\"" ;
143-
$INT64 && echo "with_intsize=64" ;
144-
[[ -d $HOME/spral ]] && echo "with_spral_cflags=-I${HOME}/spral/include" ;
145-
[[ -d $HOME/spral ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && echo "with_spral_lflags=\"-L${HOME}/spral/lib -lspral -lgfortran -lhwloc -lm -lmetis -llapack -lblas -fopenmp\"" ;
146-
[[ -d $HOME/spral ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]] && echo "with_spral_lflags=\"-L${HOME}/spral/lib -lspral -lgfortran -L/usr/local/Cellar/hwloc/2.5.0/lib -lhwloc -lm -L/usr/local/Cellar/metis/5.1.0/lib -lmetis -framework Accelerate -fopenmp\"" ;
147-
[[ "$TRAVIS_OS_NAME" == "osx" ]] && ( echo "with_metis_cflags=-I/usr/local/Cellar/metis/5.1.0/include" ; echo "with_metis_lflags=\"-L/usr/local/Cellar/metis/5.1.0/lib -lmetis\"" ) ;
140+
$ENABLEDEBUG && ( echo enable_debug=yes ; echo with_ipopt_checklevel=5 ; echo with_ipopt_verbosity=5 ) ;
141+
$SINGLEPRECISION && echo "with_precision=single" ;
142+
$SINGLEPRECISION && [[ "$TRAVIS_OS_NAME" == "osx" ]] && ! $NOF77 && echo "with_lapack=\"-L/usr/local/opt/lapack/lib -llapack -lblas\"" ;
143+
$INT64 && echo "with_intsize=64" ;
144+
[[ -d $HOME/spral ]] && echo "with_spral_cflags=-I${HOME}/spral/include" ;
145+
[[ -d $HOME/spral ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && echo "with_spral_lflags=\"-L${HOME}/spral/lib -lspral -lgfortran -lhwloc -lm -lmetis -llapack -lblas -fopenmp\"" ;
146+
[[ -d $HOME/spral ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]] && echo "with_spral_lflags=\"-L${HOME}/spral/lib -lspral -lgfortran -L/usr/local/Cellar/hwloc/2.5.0/lib -lhwloc -lm -L/usr/local/Cellar/metis/5.1.0/lib -lmetis -framework Accelerate -fopenmp\"" ;
147+
[[ "$TRAVIS_OS_NAME" == "osx" ]] && ( echo "with_metis_cflags=-I/usr/local/Cellar/metis/5.1.0/include" ; echo "with_metis_lflags=\"-L/usr/local/Cellar/metis/5.1.0/lib -lmetis\"" ) ;
148148
) > $HOME/install/share/config.site ;
149149
cat $HOME/install/share/config.site
150150
- >

0 commit comments

Comments
 (0)