Skip to content

Commit 70500c0

Browse files
committed
bump setup-ci so that fmt no longer gets installed by brew, resolves #41
1 parent a67cb64 commit 70500c0

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ jobs:
7878
BOOST_B2_OPTIONS: ${{ matrix.BOOST_B2_OPTIONS }}
7979
TBB_ENABLE_IPO: ${{ matrix.TBB_ENABLE_IPO }}
8080
steps:
81-
- uses: spatial-model-editor/setup-ci@2025.05.09
81+
- uses: spatial-model-editor/setup-ci@2025.10.6
8282
with:
83-
sme_deps_llvm: "20.1.6"
84-
sme_deps_qt: "6.9.1"
83+
sme_deps_llvm: "21.1.2"
84+
sme_deps_qt: "6.9.2"
8585
- uses: actions/checkout@v4
8686
- run: ./build.sh
8787
- uses: actions/upload-artifact@v4

build.sh

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -529,24 +529,6 @@ cmake -GNinja .. \
529529
-DSPDLOG_NO_ATOMIC_LEVELS=ON \
530530
-DCMAKE_PREFIX_PATH=$INSTALL_PREFIX
531531
cmake .. -LA
532-
rm -rf *
533-
cmake -GNinja .. \
534-
-DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
535-
-DCMAKE_BUILD_TYPE=Release \
536-
-DBUILD_SHARED_LIBS=OFF \
537-
-DCMAKE_C_FLAGS="-fpic -fvisibility=hidden" \
538-
-DCMAKE_CXX_FLAGS="-fpic -fvisibility=hidden" \
539-
-DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
540-
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
541-
-DCMAKE_CXX_STANDARD=20 \
542-
-DSPDLOG_BUILD_TESTS=OFF \
543-
-DSPDLOG_BUILD_EXAMPLE=OFF \
544-
-DSPDLOG_FMT_EXTERNAL=ON \
545-
-Dfmt_DIR="$INSTALL_PREFIX/lib/cmake/fmt" \
546-
-DSPDLOG_NO_THREAD_ID=ON \
547-
-DSPDLOG_NO_ATOMIC_LEVELS=ON \
548-
-DCMAKE_PREFIX_PATH=$INSTALL_PREFIX
549-
cmake .. -LA
550532
time ninja
551533
${SUDO_CMD} ninja install
552534
cd ../../
@@ -693,7 +675,7 @@ cmake -GNinja .. \
693675
-DVTK_USE_MPI=OFF \
694676
-DVTK_ENABLE_WRAPPING=OFF \
695677
${VTK_OPTIONS}
696-
cmake .. -LA | grep "fmt"
678+
cmake .. -LA
697679
time ninja
698680
${SUDO_CMD} ninja install
699681
cd ../../

0 commit comments

Comments
 (0)