Revert toolchain file

tresf · May 24, 2024 · f224a86 · f224a86
1 parent 4ad99e8
commit f224a86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 30 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -190,6 +190,8 @@ jobs:
                   ~/wrongbrew.sh fixbin curl
                   ~/wrongbrew.sh bundle install
                   ~/wrongbrew.sh fixbin qt@5
+                  ~/wrongbrew.sh fixbin fltk
+                  ~/wrongbrew.sh fixbin pkg-config
                   npm update -g npm
                   npm install --location=global appdmg
               env:
@@ -204,15 +206,12 @@ jobs:
                   cmake -S . \
                         -B build \
                         -DCMAKE_INSTALL_PREFIX="../target" \
-                        -DCMAKE_TOOLCHAIN_FILE="../cmake/toolchains/Apple-Arm64.cmake"
+                        -DCMAKE_APPLE_SILICON_PROCESSOR=arm64 \
+                        -DCMAKE_PREFIX_PATH="$(~/wrongbrew.sh --prefix);$(~/wrongbrew.sh --prefix qt@5)" \
                         $CMAKE_OPTS \
                         -DUSE_WERROR=OFF
           -   name: Build
               run: cmake --build build
-          -   name: Run tests
-              run: |
-                  cd build/tests
-                  ctest --output-on-failure -j3
           -   name: Package
               run: |
                   cmake --build build --target install

diff --git a/cmake/toolchains/Apple-Arm64.cmake b/cmake/toolchains/Apple-Arm64.cmake