From d1cfe857e4c27b516037cd182e4c62d16c7f5fd4 Mon Sep 17 00:00:00 2001 From: Julien Staub Date: Mon, 17 Feb 2025 09:05:37 +0100 Subject: [PATCH 1/2] update armadillo to 14.4.0 --- .github/workflows/build-windows.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index b7d89ad0..68be45fc 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -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 @@ -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: | @@ -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}}" @@ -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 @@ -359,4 +359,4 @@ jobs: path: | DFTFringeInstaller_${{env.WORKFLOW_VERSION}}.exe DFTFringe.exe.debug - + From 969daeace10fb3bf4023507d4865786200ff8b2f Mon Sep 17 00:00:00 2001 From: Julien Staub Date: Mon, 17 Feb 2025 14:46:00 +0100 Subject: [PATCH 2/2] update readme --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 981862c0..21e9440c 100644 --- a/README.md +++ b/README.md @@ -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 ``` @@ -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