Mercurial > mxe-octave
comparison makeinst-script.sh @ 3545:c21ca79d7980
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 |
comparison
equal
deleted
inserted
replaced
| 3544:f32ee23a7261 | 3545:c21ca79d7980 |
|---|---|
| 157 Pop \$0 | 157 Pop \$0 |
| 158 | 158 |
| 159 \${NSD_CreateDropList} 120u 70 100u 80u "" | 159 \${NSD_CreateDropList} 120u 70 100u 80u "" |
| 160 Pop \$InstallBlasLibCtrl | 160 Pop \$InstallBlasLibCtrl |
| 161 \${NSD_CB_AddString} \$InstallBlasLibCtrl "Reference BLAS" | 161 \${NSD_CB_AddString} \$InstallBlasLibCtrl "Reference BLAS" |
| 162 EOF | |
| 163 # add option to install libopenblas if we have the dll present | |
| 164 if [ -e $OCTAVE_SOURCE/bin/libopenblas.dll ]; then | |
| 165 cat >> $OUTFILE << EOF | |
| 162 \${NSD_CB_AddString} \$InstallBlasLibCtrl "OpenBLAS" | 166 \${NSD_CB_AddString} \$InstallBlasLibCtrl "OpenBLAS" |
| 167 EOF | |
| 168 fi | |
| 169 cat >> $OUTFILE << EOF | |
| 163 \${NSD_CB_SelectString} \$InstallBlasLibCtrl "Reference BLAS" | 170 \${NSD_CB_SelectString} \$InstallBlasLibCtrl "Reference BLAS" |
| 164 | 171 |
| 165 !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing" | 172 !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing" |
| 166 nsDialogs::Show | 173 nsDialogs::Show |
| 167 Pop \$0 | 174 Pop \$0 |