Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

just avoid arm64 by using macos-12 ?

janimatic8304de0fe28a
diff --git a/.github/workflows/workflow_macos.yml b/.github/workflows/workflow_macos.yml
index fd9b84423..40c7eedcb 100644
--- a/.github/workflows/workflow_macos.yml
+++ b/.github/workflows/workflow_macos.yml
@@ -4,7 +4,9 @@ on: [push, pull_request]
jobs:
macOS:
- runs-on: macos-latest
+ # runs-on: macos-latest
+ # avoid the headache of arm64 builds?
+ runs-on: macos-12
steps:
- uses: actions/checkout@v2
@@ -43,9 +45,6 @@ jobs:
}
brew update
brew cleanup
- # the thirdparty provided lib isn't arm64: warning: ignoring file
- # '/Users/runner/work/opentoonz/opentoonz/thirdparty/superlu/libsuperlu_4.1.a': fat file missing arch 'arm64', file has 'i386,x86_64'
- checkPkgAndInstall superlu
checkPkgAndInstall pkg-config glew lz4 libjpeg libpng lzo boost libusb libmypaint ccache jpeg-turbo ninja
checkPkgAndInstall opencv
# opencv depends on vtk and vtk depends on qt6
diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt
index 725b50a6a..10cf2a968 100644
--- a/toonz/sources/CMakeLists.txt
+++ b/toonz/sources/CMakeLists.txt
@@ -1,6 +1,4 @@
-# cmake_minimum_required(VERSION 2.8.11)
-#required by CMAKE_IGNORE_PATH
-cmake_minimum_required(VERSION 3.28.1)
+cmake_minimum_required(VERSION 2.8.11)
set(CMAKE_BUILD_TYPE_INIT Release)
@@ -372,9 +370,6 @@ elseif(BUILD_ENV_APPLE)
set(PNG_LIB ${PNG_LIBRARY})
find_package(GLEW)
- # force the github workflow to use the brew superlu instead to make it compatible with arm64
- # (as the provided lib .a in ${SDKROOT}/superlu is x86_64...)
- CMAKE_IGNORE_PATH(${SDKROOT}/superlu)
find_package(SuperLU REQUIRED)
set(SUPERLU_INCLUDE_DIR ${SUPERLU_INCLUDE_DIR}/superlu)
set(SUPERLU_LIB ${SUPERLU_LIBRARY})