Add native macosX64 target if it runs on mac (#93)

System.getProperty("os.name") == "Mac OS X" ./gradlew :nativesample:runReleaseExecutableMacosX64 Hello Native. ./nativesample/build/bin/macosX64/releaseExecutable/nativesample.kexe Hello Native.
ajalt · Oct 3, 2019 · 87862cd · 87862cd
1 parent 5c8d566
commit 87862cd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/clikt/build.gradle b/clikt/build.gradle
@@ -14,9 +14,13 @@ buildscript {
 }
 
 kotlin {
+ def runOnMac = System.getProperty("os.name") == "Mac OS X"
  targetFromPreset(presets.jvmWithJava, 'jvm')
  linuxX64('linux')
  mingwX64('win')
+ if (runOnMac) {
+ macosX64()
+ }
 
  sourceSets {
  commonMain {
@@ -52,6 +56,11 @@ kotlin {
  configure([linuxMain, winMain]) {
  dependsOn commonMain
  }
+ if (runOnMac) {
+ configure(macosX64Main) {
+ dependsOn linuxMain
+ }
+ }
  }
 }
 

diff --git a/nativesample/build.gradle b/nativesample/build.gradle
@@ -1,6 +1,15 @@
 apply plugin: 'org.jetbrains.kotlin.multiplatform'
 
+
 kotlin {
+ def runOnMac = System.getProperty("os.name") == "Mac OS X"
+ if (runOnMac) macosX64 {
+ binaries {
+ executable {
+ entryPoint = 'com.github.ajalt.clikt.sample.main'
+ }
+ }
+ }
  mingwX64('winX64') {
  binaries {
  executable {
@@ -10,10 +19,16 @@ kotlin {
  }
 
  sourceSets {
- winX64Main {
+ main {
  dependencies {
  implementation project(':clikt')
  }
  }
+ if (runOnMac) configure(macosX64Main) {
+ dependsOn main
+ }
+ configure(winX64Main) {
+ dependsOn main
+ }
  }
 }
diff --git a/...lin/com/github/ajalt/clikt/sample/main.kt → ...lin/com/github/ajalt/clikt/sample/main.kt b/...lin/com/github/ajalt/clikt/sample/main.kt → ...lin/com/github/ajalt/clikt/sample/main.kt