Skip to content

Commit 79fcbb5

Browse files
authored
Merge pull request #97 from sellmair/KT-46273
Only 'linkNativeSourceSets' when at least one native target is config…
2 parents 82d386e + c99ab21 commit 79fcbb5

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

buildSrc/src/main/kotlin/BuildHelpers.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinTargetPreset
2626
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsTargetPreset
2727
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmWithJavaTargetPreset
2828
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
29+
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetPreset
2930
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
3031
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
3132
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetPreset
@@ -58,6 +59,8 @@ fun Project.standardConfiguration(
5859
private val ideaActive by lazy { System.getProperty("idea.active") == "true" }
5960
private val KotlinTargetPreset<*>.isJsTargetPreset: Boolean
6061
get() = this is KotlinJsTargetPreset || this is KotlinJsIrTargetPreset
62+
private val KotlinTargetPreset<*>.isNativeTargetPreset: Boolean
63+
get() = this is KotlinNativeTargetPreset
6164
private val KotlinTarget.isJsTarget: Boolean
6265
get() = this is KotlinJsTarget || this is KotlinJsIrTarget
6366

@@ -95,7 +98,9 @@ private fun KotlinMultiplatformExtension.buildAllTargets(targetPresets: NamedDom
9598
}
9699
}
97100

98-
linkNativeSourceSets()
101+
if (targetPresets.any { it.isNativeTargetPreset }) {
102+
linkNativeSourceSets()
103+
}
99104
}
100105

101106
private fun KotlinMultiplatformExtension.linkNativeSourceSets() {

0 commit comments

Comments
 (0)