Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/build-windows-QT5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
QWT_version: 6.1.6
openCV_version: 4.6.0
QT_version: 5.15.2
lapack_version: 3.11.0
lapack_version: 3.12.1
mingw_version: 810
python_version: 3.13

Expand Down Expand Up @@ -375,4 +375,3 @@ jobs:
path: |
DFTFringeInstaller_QT5_${{env.WORKFLOW_VERSION}}.exe
DFTFringe.exe.debug

5 changes: 2 additions & 3 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
QWT_version: 6.3.0
openCV_version: 4.12.0
QT_version: 6.8.3
lapack_version: 3.11.0
lapack_version: 3.12.1
mingw_version: 1310
python_version: 3.13

Expand Down Expand Up @@ -203,10 +203,9 @@ jobs:
repository: 'Reference-LAPACK/lapack'
ref: 'v${{env.lapack_version}}'
path: './lapack'
# See https://github.com/Reference-LAPACK/lapack/issues/305 : CMAKE_SHARED_LINKER_FLAGS is fixing a build issue
- name: cmake generate
if: steps.cache-lapack.outputs.cache-hit != 'true'
run: cmake -G "MinGW Makefiles" -S lapack -B build_lapack -D BUILD_SHARED_LIBS=ON -D CMAKE_SHARED_LINKER_FLAGS="-Wl,--allow-multiple-definition"
run: cmake -G "MinGW Makefiles" -S lapack -B build_lapack -D BUILD_SHARED_LIBS=ON
- name: cmake build
if: steps.cache-lapack.outputs.cache-hit != 'true'
run: cmake --build ./build_lapack -j4
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,11 @@ mingw32-make -j4

#### Build Lapack and Blas

Get [Lapack](https://www.netlib.org/lapack/) source code version 3.11.0 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\lapack`. Lapack comes with Blas.
Get [Lapack](https://www.netlib.org/lapack/) source code version 3.12.1 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\lapack`. Lapack comes with Blas.

Then from within `C:\buildingDFTFringe` do the following:
```
cmake -G "MinGW Makefiles" -S lapack -B build_lapack -D BUILD_SHARED_LIBS=ON -D CMAKE_SHARED_LINKER_FLAGS="-Wl,--allow-multiple-definition"
cmake -G "MinGW Makefiles" -S lapack -B build_lapack -D BUILD_SHARED_LIBS=ON
cmake --build ./build_lapack -j4
```

Expand Down
Loading