format + tidy + imgui iwyu + macos13 runner

krupkat · Dec 31, 2024 · 2f21c83 · 2f21c83
1 parent 2bacf1a
commit 2f21c83
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -385,7 +385,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-12, macos-14]
+        os: [macos-13, macos-14]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/external/imgui b/external/imgui
diff --git a/misc/build/build-macos.sh b/misc/build/build-macos.sh
@@ -18,7 +18,7 @@ cmake -B build \
   -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
   -DCMAKE_INSTALL_PREFIX=install \
   `cat ../misc/build/opencv-minimal-flags.txt`
-cmake --build build --target install -j `sysctl -n hw.physicalcpu`
+cmake --build build --target install -j `sysctl -n hw.logicalcpu`
 cd ..
 
 
@@ -27,7 +27,7 @@ cd exiv2
 cmake -B build \
   -DCMAKE_INSTALL_PREFIX=install \
   `cat ../misc/build/exiv2-minimal-flags.txt`
-cmake --build build --target install -j `sysctl -n hw.physicalcpu`
+cmake --build build --target install -j `sysctl -n hw.logicalcpu`
 cd ..
 
 cmake -B build \
@@ -38,7 +38,7 @@ cmake -B build \
   -DOpenCV_ROOT=opencv/install \
   -Dexiv2_ROOT=exiv2/install
 
-cmake --build build -j `sysctl -n hw.physicalcpu` --target install
+cmake --build build -j `sysctl -n hw.logicalcpu` --target install
 cd build
 ctest --output-on-failure
 cd ..

diff --git a/xpano/gui/backends/base.cc b/xpano/gui/backends/base.cc
@@ -7,7 +7,7 @@
 
 namespace xpano::gui::backends {
 
-TexDeleter::TexDeleter(Base* backend) : backend_(backend){};
+TexDeleter::TexDeleter(Base* backend) : backend_(backend) {};
 
 void TexDeleter::operator()(ImTextureID tex) {
   if (backend_ != nullptr) {

diff --git a/xpano/utils/fmt.h b/xpano/utils/fmt.h
@@ -9,7 +9,7 @@
 #include <spdlog/fmt/fmt.h>
 
 #if FMT_VERSION >= 110000
-#include <spdlog/fmt/bundled/ranges.h> // fmt::join moved here in fmt 11.0.0
+#include <spdlog/fmt/bundled/ranges.h>  // fmt::join moved here in fmt 11.0.0
 #endif
 
 #else