Skip to content

Bump Armadillo vesion to latest 14.4.0 to 15.2.2 #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atsju merged 1 commit into from
Dec 3, 2025
Merged

Bump Armadillo vesion to latest 14.4.0 to 15.2.2 #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
workflow_call:

env:
armadillo_version: 14.4.0
armadillo_version: 15.2.2
QWT_version: 6.1.6
openCV_version: 4.6.0
QT_version: 5.15.2
Expand Down Expand Up @@ -375,4 +375,3 @@ jobs:
path: |
DFTFringeInstaller_QT5_${{env.WORKFLOW_VERSION}}.exe
DFTFringe.exe.debug

2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
workflow_call:

env:
armadillo_version: 14.4.0
armadillo_version: 15.2.2
QWT_version: 6.3.0
openCV_version: 4.12.0
QT_version: 6.8.3
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ cmake --build ./build_lapack -j4

#### Build Armadillo

Get [Armadillo](https://arma.sourceforge.net/) source code version 14.4.0 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\armadillo-14.4.0`.
Get [Armadillo](https://arma.sourceforge.net/) source code version 15.2.2 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\armadillo-15.2.2`.

Then from within `C:\buildingDFTFringe` do the following:
```
cmake -D CMAKE_PREFIX_PATH=C:/buildingDFTFringe/build_lapack -G "MinGW Makefiles" -S armadillo-14.4.0 -B build_armadillo
cmake -D CMAKE_PREFIX_PATH=C:/buildingDFTFringe/build_lapack -G "MinGW Makefiles" -S armadillo-15.2.2 -B build_armadillo
cmake --build ./build_armadillo -j4
```

Expand All @@ -205,10 +205,10 @@ No additional modification required here.

#### Build Armadillo

Get [Armadillo](https://arma.sourceforge.net/) source code version 14.4.0 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\armadillo-14.4.0`.
Get [Armadillo](https://arma.sourceforge.net/) source code version 15.2.2 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\armadillo-15.2.2`.

Then follow the information in `DFTFringe.pro` to create appropriate folders for header files and DLLs.
Copy content from `armadillo-14.4.0\include` to `build_armadillo\tmp\include`.
Copy content from `armadillo-15.2.2\include` to `build_armadillo\tmp\include`.

#### Copy all the DLLs

Expand Down
Loading