From c81913f87019a29846442a1203163d1bf2ad1c74 Mon Sep 17 00:00:00 2001 From: Julien STAUB Date: Sun, 30 Nov 2025 09:38:19 +0100 Subject: [PATCH 1/2] update lapack to lastest version 4.11.0 to 4.12.1 --- .github/workflows/build-windows-QT5.yml | 3 +-- .github/workflows/build-windows.yml | 2 +- README.md | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-windows-QT5.yml b/.github/workflows/build-windows-QT5.yml index e5f5a5bf..6a563cdf 100644 --- a/.github/workflows/build-windows-QT5.yml +++ b/.github/workflows/build-windows-QT5.yml @@ -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 @@ -375,4 +375,3 @@ jobs: path: | DFTFringeInstaller_QT5_${{env.WORKFLOW_VERSION}}.exe DFTFringe.exe.debug - diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 07aed21e..860a6833 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -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 diff --git a/README.md b/README.md index 36ef80cc..c7cc46a5 100644 --- a/README.md +++ b/README.md @@ -169,7 +169,7 @@ 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: ``` From f38f6c35ea41729c1877b76a5996d71fef7b64b7 Mon Sep 17 00:00:00 2001 From: Julien STAUB Date: Sun, 30 Nov 2025 10:04:15 +0100 Subject: [PATCH 2/2] newer mingw doesn't need workaround anymore --- .github/workflows/build-windows.yml | 3 +-- README.md | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 860a6833..a4cdcd7f 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -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 diff --git a/README.md b/README.md index c7cc46a5..61840b86 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ Get [Lapack](https://www.netlib.org/lapack/) source code version 3.12.1 in your 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 ```