Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions buildSrc/src/main/kotlin/processing/gradle/CargoBuildTask.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package processing.gradle
import org.gradle.api.DefaultTask
import org.gradle.api.file.DirectoryProperty
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.ListProperty
import org.gradle.api.provider.Property
import org.gradle.api.tasks.*
import org.gradle.process.ExecOperations
Expand All @@ -25,6 +26,9 @@ abstract class CargoBuildTask : DefaultTask() {
@get:Input
abstract val cargoPath: Property<String>

@get:Input
abstract val features: ListProperty<String>

@get:OutputFile
abstract val outputLibrary: RegularFileProperty

Expand All @@ -34,6 +38,7 @@ abstract class CargoBuildTask : DefaultTask() {

// release by default
release.convention(true)
features.convention(emptyList())
}

@TaskAction
Expand All @@ -45,9 +50,14 @@ abstract class CargoBuildTask : DefaultTask() {
if (release.get()) {
args.add("--release")
}
if (features.get().isNotEmpty()) {
args.add("--features")
args.add(features.get().joinToString(","))
}
args.add("--manifest-path")
args.add(manifestPath.get())


execOperations.exec {
workingDir = cargoWorkspaceDir.get().asFile
commandLine = listOf(cargoPath.get()) + args
Expand Down
3 changes: 3 additions & 0 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ if (enableWebGPU) {
manifestPath.set(ffiManifestPath)
release.set(true)
cargoPath.set(PlatformUtils.getCargoPath())
if (currentPlatform.os == "linux") {
features.set(listOf("x11", "wayland"))
}
outputLibrary.set(file("$rustTargetDir/release/${currentPlatform.libName}"))

inputs.files(fileTree("$libprocessingDir/crates") {
Expand Down
2 changes: 1 addition & 1 deletion libprocessing
Submodule libprocessing updated 100 files
Loading