From c1f884279d3cf0eaccddfb926e06b1501e1d4f5f Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Wed, 3 Jun 2026 12:03:13 +0200
Subject: [PATCH] Architecture is set in CI file, not in CMake file (so one can
 still compile with mtune=native, march=native

---
 .gitea/workflows/build_and_test.yml | 15 +++++++++------
 CMakeLists.txt                      |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/build_and_test.yml b/.gitea/workflows/build_and_test.yml
index 056ba51c..ac19d87e 100644
--- a/.gitea/workflows/build_and_test.yml
+++ b/.gitea/workflows/build_and_test.yml
@@ -1,5 +1,8 @@
 name: Build Packages
 
+env:
+  MARCH_CMAKE_FLAGS: '-DCMAKE_CXX_FLAGS="-march=x86-64-v3" -DCMAKE_C_FLAGS="-march=x86-64-v3"'
+
 on:
   push:
     branches:
@@ -33,7 +36,7 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ env.MARCH_CMAKE_FLAGS }} ..
           ninja -j48 jfjoch_test jfjoch_hdf5_test jfjoch_hdf5_enospc_test enospc_shim
       - name: Run unit tests
         shell: bash
@@ -116,7 +119,7 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          cmake -G Ninja -DJFJOCH_INSTALL_DRIVER_SOURCE=ON -DJFJOCH_VIEWER_BUILD=ON -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_flags }} ..
+          cmake -G Ninja -DJFJOCH_INSTALL_DRIVER_SOURCE=ON -DJFJOCH_VIEWER_BUILD=ON ${{ env.MARCH_CMAKE_FLAGS }} -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_flags }} ..
       - name: Build packages
         shell: bash
         run: |
@@ -167,7 +170,7 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ env.MARCH_CMAKE_FLAGS }} ..
           ninja -j16 jfjoch_hdf5_test
       - name: Run DIALS processing on legacy format
         shell: bash
@@ -203,7 +206,7 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ env.MARCH_CMAKE_FLAGS }} ..
           ninja -j16 jfjoch_hdf5_test
       - name: Run XDS with Durin and legacy HDF5 format
         shell: bash
@@ -239,7 +242,7 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ env.MARCH_CMAKE_FLAGS }} ..
           ninja -j16 jfjoch_hdf5_test 
           ninja -j16 jfjoch_xds_plugin
       - name: Run XDS with legacy HDF5 format
@@ -275,7 +278,7 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ env.MARCH_CMAKE_FLAGS }} ..
           ninja -j16 jfjoch_hdf5_test
       - name: Run XDS with Neggia and legacy HDF5 format
         shell: bash
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fd729a3..02668e08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,8 +8,8 @@ SET(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 SET(CMAKE_CXX_STANDARD 20)
 SET(CMAKE_CXX_STANDARD_REQUIRED True)
 
-SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wno-deprecated-enum-enum-conversion -DNDEBUG -march=x86-64-v3")
-SET(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -march=x86-64-v3")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wno-deprecated-enum-enum-conversion -DNDEBUG")
+SET(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
 
 SET(JFJOCH_WRITER_ONLY           OFF CACHE BOOL "Compile HDF5 writer only")
 SET(JFJOCH_INSTALL_DRIVER_SOURCE OFF CACHE BOOL "Install kernel driver source (ignored if building writer only; necessary for RPM building)")