Skip to content

Commit

Permalink
try to get more info
Browse files Browse the repository at this point in the history
  • Loading branch information
dellis1972 committed Feb 22, 2024
1 parent 1069f79 commit dfb6b2f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ jobs:
env:
ACTIONS_RUNTIME_TOKEN: ${{ env.ACTIONS_RUNTIME_TOKEN }}
ACTIONS_RUNTIME_URL: "${{ env.ACTIONS_RUNTIME_URL }}"
- name: List
if: runner.os != 'Linux'
run: ls assimp
- name: List
if: runner.os == 'Windows'
run: dir assimp
deploy:
name: deploy
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion build/BuildLinuxTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public sealed class BuildLinuxTask : FrostingTask<BuildContext>
public override void Run(BuildContext context)
{
var buildWorkingDir = "assimp/";
context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "CMakeLists.txt"});
context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF CMakeLists.txt"});
context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = ""});
context.CopyFile(@"assimp/bin/libassimp.so", $"{context.ArtifactsDir}/libassimp.so");
}
Expand Down
2 changes: 1 addition & 1 deletion build/BuildMacOSTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public sealed class BuildMacOSTask : FrostingTask<BuildContext>
public override void Run(BuildContext context)
{
var buildWorkingDir = "assimp/";
context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "CMakeLists.txt"});
context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF CMakeLists.txt"});
context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = ""});
context.CopyFile(@"assimp/bin/libassimp.5.3.0.dylib", $"{context.ArtifactsDir}/libassimp.dylib");
}
Expand Down
3 changes: 2 additions & 1 deletion build/BuildWindowsTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ public override void Run(BuildContext context)
{
var buildWorkingDir = "assimp/";
// Disable openmp so there is no dependency on VCOMP140.dll
context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "CMakeLists.txt"});
context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF CMakeLists.txt"});
context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = ""});
context.CopyFile("assimp/bin/assimp.dll", $"{context.ArtifactsDir}/assimp.dll");
}
}

0 comments on commit dfb6b2f

Please sign in to comment.