Skip to content

Commit 3954294

Browse files
authored
Update CMake arguments for MacOS build (#5)
* Update CMake arguments for MacOS build Fixes MonoGame/MonoGame#9013 * Fix cmake arguments formatting in BuildMacOSTask * Fix Mac build by not building zlib * Update Ubuntu version in CI workflow
1 parent 652b049 commit 3954294

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ${{ matrix.os }}
1010
strategy:
1111
matrix:
12-
os: [windows-latest, macos-latest, ubuntu-20.04]
12+
os: [windows-latest, macos-latest, ubuntu-22.04]
1313
fail-fast: false
1414
steps:
1515
- name: Expose GitHub Runtime

build/BuildMacOSTask.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public sealed class BuildMacOSTask : FrostingTask<BuildContext>
1212
public override void Run(BuildContext context)
1313
{
1414
var buildWorkingDir = "assimp/";
15-
context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" CMakeLists.txt" });
15+
context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DASSIMP_BUILD_ZLIB=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" CMakeLists.txt" });
1616
context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "" });
1717
var files = Directory.GetFiles(System.IO.Path.Combine(buildWorkingDir, "bin"), "libassimp.*.*.*.dylib", SearchOption.TopDirectoryOnly);
1818
context.CopyFile(files[0], $"{context.ArtifactsDir}/libassimp.dylib");

0 commit comments

Comments
 (0)