diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index df3df0d..01aed0e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,10 +12,10 @@ permissions: env: BUILD_TYPE: Release - SDL_VERSION: "release-2.30.7" + SDL_VERSION: "release-2.30.10" OPENCV_VERSION: "4.10.0" CATCH_VERSION: "v3.7.1" - SPDLOG_VERSION: "v1.14.1" + SPDLOG_VERSION: "v1.15.0" EXIV2_VERSION: "v0.28.3" GENERATOR: "Ninja Multi-Config" @@ -385,7 +385,7 @@ jobs: strategy: matrix: - os: [macos-12, macos-14] + os: [macos-13, macos-14] steps: - uses: actions/checkout@v4 @@ -412,7 +412,7 @@ jobs: -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DCMAKE_INSTALL_PREFIX=install \ `cat ../misc/build/opencv-minimal-flags.txt` - cmake --build build --target install -j $(nproc) + cmake --build build --target install -j `sysctl -n hw.logicalcpu` cd .. - name: Cache exiv2 @@ -430,7 +430,7 @@ jobs: cmake -B build \ -DCMAKE_INSTALL_PREFIX=install \ `cat ../misc/build/exiv2-minimal-flags.txt` - cmake --build build --target install -j $(nproc) + cmake --build build --target install -j `sysctl -n hw.logicalcpu` cd .. - name: Configure CMake @@ -444,7 +444,7 @@ jobs: -Dexiv2_ROOT=exiv2/install - name: Build - run: cmake --build build -j $(nproc) --target install + run: cmake --build build -j `sysctl -n hw.logicalcpu` --target install - name: Run Tests run: | diff --git a/external/imgui b/external/imgui index 8641c78..32c4c8a 160000 --- a/external/imgui +++ b/external/imgui @@ -1 +1 @@ -Subproject commit 8641c783b6ab252944b424a8aada608683b420f9 +Subproject commit 32c4c8a84d191868e9bbf30c8b284a3dda7053ee diff --git a/misc/build/build-bullseye.sh b/misc/build/build-bullseye.sh index 481dce7..2a8d64b 100755 --- a/misc/build/build-bullseye.sh +++ b/misc/build/build-bullseye.sh @@ -1,8 +1,8 @@ export BUILD_TYPE='Release' -export SDL_VERSION='release-2.30.7' +export SDL_VERSION='release-2.30.10' # export OPENCV_VERSION='4.10.0' export CATCH_VERSION='v3.7.1' -export SPDLOG_VERSION='v1.14.1' +export SPDLOG_VERSION='v1.15.0' export EXIV2_VERSION='v0.28.3' # export GENERATOR='Ninja Multi-Config' diff --git a/misc/build/build-macos.sh b/misc/build/build-macos.sh index f3b64b2..7988926 100755 --- a/misc/build/build-macos.sh +++ b/misc/build/build-macos.sh @@ -1,10 +1,10 @@ # DO NOT MODIFY: Auto-generated by the gen_installer.py script from the .github/workflows/test.yml Github Action export BUILD_TYPE='Release' -export SDL_VERSION='release-2.30.7' +export SDL_VERSION='release-2.30.10' export OPENCV_VERSION='4.10.0' export CATCH_VERSION='v3.7.1' -export SPDLOG_VERSION='v1.14.1' +export SPDLOG_VERSION='v1.15.0' export EXIV2_VERSION='v0.28.3' export GENERATOR='Ninja Multi-Config' @@ -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 $(nproc) +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 $(nproc) +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 $(nproc) --target install +cmake --build build -j `sysctl -n hw.logicalcpu` --target install cd build ctest --output-on-failure cd .. diff --git a/misc/build/build-ubuntu-20.sh b/misc/build/build-ubuntu-20.sh index 19daba4..0d27f25 100755 --- a/misc/build/build-ubuntu-20.sh +++ b/misc/build/build-ubuntu-20.sh @@ -1,10 +1,10 @@ # DO NOT MODIFY: Auto-generated by the gen_installer.py script from the .github/workflows/test.yml Github Action export BUILD_TYPE='Release' -export SDL_VERSION='release-2.30.7' +export SDL_VERSION='release-2.30.10' export OPENCV_VERSION='4.10.0' export CATCH_VERSION='v3.7.1' -export SPDLOG_VERSION='v1.14.1' +export SPDLOG_VERSION='v1.15.0' export EXIV2_VERSION='v0.28.3' export GENERATOR='Ninja Multi-Config' diff --git a/misc/build/build-ubuntu-22.sh b/misc/build/build-ubuntu-22.sh index 063a41a..b844ecc 100755 --- a/misc/build/build-ubuntu-22.sh +++ b/misc/build/build-ubuntu-22.sh @@ -1,10 +1,10 @@ # DO NOT MODIFY: Auto-generated by the gen_installer.py script from the .github/workflows/test.yml Github Action export BUILD_TYPE='Release' -export SDL_VERSION='release-2.30.7' +export SDL_VERSION='release-2.30.10' export OPENCV_VERSION='4.10.0' export CATCH_VERSION='v3.7.1' -export SPDLOG_VERSION='v1.14.1' +export SPDLOG_VERSION='v1.15.0' export EXIV2_VERSION='v0.28.3' export GENERATOR='Ninja Multi-Config' diff --git a/misc/build/build-universal.sh b/misc/build/build-universal.sh index c120c16..ed23c58 100755 --- a/misc/build/build-universal.sh +++ b/misc/build/build-universal.sh @@ -1,8 +1,8 @@ export BUILD_TYPE='Release' -export SDL_VERSION='release-2.30.7' +export SDL_VERSION='release-2.30.10' export OPENCV_VERSION='4.10.0' export CATCH_VERSION='v3.7.1' -export SPDLOG_VERSION='v1.14.1' +export SPDLOG_VERSION='v1.15.0' export EXIV2_VERSION='v0.28.3' export GENERATOR='Ninja Multi-Config' export C_COMPILER='gcc' diff --git a/misc/build/build-windows-latest.ps1 b/misc/build/build-windows-latest.ps1 index fc1669c..e5fe7c1 100644 --- a/misc/build/build-windows-latest.ps1 +++ b/misc/build/build-windows-latest.ps1 @@ -1,10 +1,10 @@ # DO NOT MODIFY: Auto-generated by the gen_installer.py script from the .github/workflows/test.yml Github Action $env:BUILD_TYPE = 'Release' -$env:SDL_VERSION = 'release-2.30.7' +$env:SDL_VERSION = 'release-2.30.10' $env:OPENCV_VERSION = '4.10.0' $env:CATCH_VERSION = 'v3.7.1' -$env:SPDLOG_VERSION = 'v1.14.1' +$env:SPDLOG_VERSION = 'v1.15.0' $env:EXIV2_VERSION = 'v0.28.3' $env:GENERATOR = 'Ninja Multi-Config' diff --git a/misc/build/nix/default.nix b/misc/build/nix/default.nix index d6899d6..16623e3 100644 --- a/misc/build/nix/default.nix +++ b/misc/build/nix/default.nix @@ -13,6 +13,6 @@ pkgs.mkShell { exiv2 dbus (python3.withPackages (pkgs: with pkgs; [ pyyaml ])) - clang-tools_15 + clang-tools_18 ]; } \ No newline at end of file diff --git a/xpano/utils/fmt.h b/xpano/utils/fmt.h index e3ae95d..6b8b5de 100644 --- a/xpano/utils/fmt.h +++ b/xpano/utils/fmt.h @@ -8,6 +8,10 @@ #include +#if FMT_VERSION >= 110000 +#include // fmt::join moved here in fmt 11.0.0 +#endif + #else #include