aboutsummaryrefslogtreecommitdiff
path: root/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/JniNative.scala
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2016-01-10 10:46:35 -0800
committerJakob Odersky <jodersky@gmail.com>2016-01-10 10:46:35 -0800
commitc85463d30f73a43eb5275c504657a5117c126ca4 (patch)
treec9ece4c24b45c806efeb566882a2b98bc3d821c5 /jni-plugin/src/main/scala/ch/jodersky/sbt/jni/JniNative.scala
parent85626c7675d3fe72072ef4192918291ec835cb45 (diff)
downloadsbt-jni-c85463d30f73a43eb5275c504657a5117c126ca4.tar.gz
sbt-jni-c85463d30f73a43eb5275c504657a5117c126ca4.tar.bz2
sbt-jni-c85463d30f73a43eb5275c504657a5117c126ca4.zip
Add support for autotoolsv0.2-SNAPSHOT
Diffstat (limited to 'jni-plugin/src/main/scala/ch/jodersky/sbt/jni/JniNative.scala')
-rw-r--r--jni-plugin/src/main/scala/ch/jodersky/sbt/jni/JniNative.scala13
1 files changed, 8 insertions, 5 deletions
diff --git a/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/JniNative.scala b/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/JniNative.scala
index 7e36f50..90f7cc8 100644
--- a/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/JniNative.scala
+++ b/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/JniNative.scala
@@ -21,19 +21,19 @@ object JniNative extends AutoPlugin {
}
import autoImport._
- lazy val rawSettings: Seq[Setting[_]] = Seq(
+ lazy val settings: Seq[Setting[_]] = Seq(
sourceDirectory in jni := baseDirectory.value / "src",
- target in Global in jni := target.value / "native" / (jniPlatform in jni).value.id,
+ target in jni := target.value / "native" / (jniPlatform in jni).value.id,
- jniPlatform in Global in jni := Platform.current.getOrElse {
+ jniPlatform in jni := Platform.current.getOrElse {
sLog.value.warn("Warning: cannot determine platform! It will be set to 'unknown'.")
Platform.Unknown
},
jniBuildTool in jni := {
- val tools = Seq(CMake)
+ val tools = Seq(CMake, Autotools)
val base = (sourceDirectory in jni).value
@@ -109,6 +109,9 @@ object JniNative extends AutoPlugin {
)
- override lazy val projectSettings = inConfig(Compile)(rawSettings)
+ override lazy val projectSettings = inConfig(Compile)(settings) ++ Seq(
+ //don't scala version to native jars
+ crossPaths := false
+ )
}