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
10 changes: 5 additions & 5 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
workflow_call:

env:
armadillo_version: 12.6.7
armadillo_version: 14.4.0
QWT_version: 6.1.6
openCV_version: 4.6.0
QT_version: 5.15.2
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
- uses: actions/checkout@v4
# with:
# path: 'DFTFringe'

# copy all files for problem matcher to work
- name: copy files into build folder (problem matcher workaround)
run: |
Expand Down Expand Up @@ -303,7 +303,7 @@ jobs:
# suffix will be commit sha 5108ce7c3ac60bec1e0867bb10c4497db67e3606
run: |
echo "WORKFLOW_VERSION=${{github.sha}}" >> $env:GITHUB_ENV

- name: Find and Replace MY_AUTOMATED_VERSION_STRING
run: |
echo "${{env.WORKFLOW_VERSION}}"
Expand All @@ -318,7 +318,7 @@ jobs:
run: |
echo "${{env.NOW}}"
(Get-Content DFTFringe/DFTFringeInstaller/packages/com.githubdoe.DFTFringe/meta/package.xml).replace('MY_AUTOMATED_DATE_STRING', '${{env.NOW}}') | Set-Content DFTFringe/DFTFringeInstaller/packages/com.githubdoe.DFTFringe/meta/package.xml

- run: cd DFTFringe ; ..\${{env.QT_version}}\mingw81_64\bin\qmake.exe
- run: echo "::add-matcher::.github/matcher/uic_matcher.json"
- run: cd DFTFringe ; mingw32-make -j4
Expand Down Expand Up @@ -359,4 +359,4 @@ jobs:
path: |
DFTFringeInstaller_${{env.WORKFLOW_VERSION}}.exe
DFTFringe.exe.debug

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ cmake --build ./build_lapack -j4

#### Build Armadillo

Get [Armadillo](https://arma.sourceforge.net/) source code version 12.6.7 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\armadillo-12.6.7`.
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`.

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

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

#### Build Armadillo

Get [Armadillo](https://arma.sourceforge.net/) source code version 12.6.7 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\armadillo-12.6.7`.
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`.

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

#### Copy all the DLLs

Expand Down
Loading