COMP: Allwmake: pass through targetType

This commit is contained in:
mattijs
2018-08-02 10:18:59 +01:00
parent 4396caaa39
commit d99707facd
3 changed files with 6 additions and 3 deletions

View File

@ -1,12 +1,13 @@
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching)
. $WM_PROJECT_DIR/wmake/scripts/have_fftw . $WM_PROJECT_DIR/wmake/scripts/have_fftw
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
if have_fftw if have_fftw
then then
wmake wmake $targetType
else else
echo "==> skip noise utility (no FFTW)" echo "==> skip noise utility (no FFTW)"
fi fi

View File

@ -1,12 +1,13 @@
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching)
. $WM_PROJECT_DIR/wmake/scripts/have_fftw . $WM_PROJECT_DIR/wmake/scripts/have_fftw
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
if have_fftw if have_fftw
then then
wmake wmake $targetType
else else
echo "==> skip boxTurb utility (no FFTW)" echo "==> skip boxTurb utility (no FFTW)"
fi fi

View File

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching)
. $WM_PROJECT_DIR/wmake/scripts/have_cgal . $WM_PROJECT_DIR/wmake/scripts/have_cgal
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -14,6 +15,6 @@ else
export COMP_FLAGS="-DNO_CGAL" export COMP_FLAGS="-DNO_CGAL"
fi fi
wmake wmake $targetType
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------