Mercurial > mxe-octave

diff makeinst-script.sh @ 3545:c21ca79d7980

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove ENABLE_OPEN_BLAS from .mk files and use just to add openblass to the distribution * makeinst-script.sh: check if libopenblas.dll is in distro before adding combo box option. * src/arpack.mk, lapack.mk, octave.mk, qrupdate.mk, stable-octave.mk, suitesparse.mk: remove ENABLE_OPENBLAS option.
author John Donoghue
date Thu, 20 Feb 2014 14:48:42 -0500
parents 6a97f4d1dedb
children b82ff8ba6a8a
line wrap: on
line diff
--- a/makeinst-script.sh	Thu Feb 20 02:08:21 2014 -0500
+++ b/makeinst-script.sh	Thu Feb 20 14:48:42 2014 -0500
@@ -159,7 +159,14 @@
   \${NSD_CreateDropList} 120u 70 100u 80u ""
   Pop \$InstallBlasLibCtrl
   \${NSD_CB_AddString} \$InstallBlasLibCtrl "Reference BLAS"
+EOF
+   # add option to install libopenblas if we have the dll present
+   if [ -e $OCTAVE_SOURCE/bin/libopenblas.dll ]; then
+     cat >> $OUTFILE << EOF
   \${NSD_CB_AddString} \$InstallBlasLibCtrl "OpenBLAS"
+EOF
+  fi
+  cat >> $OUTFILE << EOF
   \${NSD_CB_SelectString} \$InstallBlasLibCtrl "Reference BLAS"
 
   !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing"