fix cmake arguments

This commit is contained in:
Faruk D 2018-10-02 01:45:42 +02:00
parent 3eccc59b6b
commit 5c17da1803
1 changed files with 3 additions and 2 deletions

View File

@ -16,10 +16,12 @@ OPTS=''
case $IMAGE in case $IMAGE in
ubuntu) ubuntu)
echo 'Building for Ubuntu'
CMAKE_EXE=$(which cmake) CMAKE_EXE=$(which cmake)
OPTS='' OPTS=''
;; ;;
sl7) sl7)
echo 'Building for Scientific Linux'
CMAKE_EXE=$(which cmake3) CMAKE_EXE=$(which cmake3)
OPTS='-DUSE_FFTW3=ON \ OPTS='-DUSE_FFTW3=ON \
-DCMAKE_INSTALL_PREFIX=/opt/casacore \ -DCMAKE_INSTALL_PREFIX=/opt/casacore \
@ -51,8 +53,7 @@ echo 'ls -asl /travis/workdir/$BUILD_DIR: '
ls -asl /travis/workdir/$BUILD_DIR ls -asl /travis/workdir/$BUILD_DIR
$CMAKE_EXE /travis/workdir -DCMAKE_INSTALL_PREFIX=/opt/sagecal \ $CMAKE_EXE /travis/workdir -DCMAKE_INSTALL_PREFIX=/opt/sagecal $OPTS
$OPTS
make -j4 && \ make -j4 && \
make install && \ make install && \