diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-06-07 14:58:31 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2016-06-07 15:34:23 -0700 |
| commit | e9ae890252fb1924dd4bbe102336181108462858 (patch) | |
| tree | 55cbd9090ee73a709850fcd5cfc96c5a03f506d0 /plugin/src/main/scala/ch/jodersky/sbt | |
| parent | e83013bc805f9ee3f9c9edfa838a41ba51fe8348 (diff) | |
| download | sbt-jni-e9ae890252fb1924dd4bbe102336181108462858.tar.gz sbt-jni-e9ae890252fb1924dd4bbe102336181108462858.tar.bz2 sbt-jni-e9ae890252fb1924dd4bbe102336181108462858.zip | |
Update paramaters passed to CMake from sbt
Diffstat (limited to 'plugin/src/main/scala/ch/jodersky/sbt')
| -rw-r--r-- | plugin/src/main/scala/ch/jodersky/sbt/jni/build/CMake.scala | 4 | ||||
| -rw-r--r-- | plugin/src/main/scala/ch/jodersky/sbt/jni/build/ConfigureMakeInstall.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugin/src/main/scala/ch/jodersky/sbt/jni/build/CMake.scala b/plugin/src/main/scala/ch/jodersky/sbt/jni/build/CMake.scala index eb7be1e..99e3f5b 100644 --- a/plugin/src/main/scala/ch/jodersky/sbt/jni/build/CMake.scala +++ b/plugin/src/main/scala/ch/jodersky/sbt/jni/build/CMake.scala @@ -23,8 +23,8 @@ object CMake extends BuildTool with ConfigureMakeInstall { // disable producing versioned library files, not needed for fat jars "cmake " + s"-DCMAKE_INSTALL_PREFIX:PATH=${target.getAbsolutePath} " + - s"-DLIB_INSTALL_DIR:PATH=${target.getAbsolutePath} " + - "-DLIB_ENABLE_MINOR_VERSIONS:BOOLEAN=OFF " + + s"-DCMAKE_BUILD_TYPE=Release" + + s"-DSBT:BOOLEAN=true " + baseDirectory.getAbsolutePath, buildDirectory ) diff --git a/plugin/src/main/scala/ch/jodersky/sbt/jni/build/ConfigureMakeInstall.scala b/plugin/src/main/scala/ch/jodersky/sbt/jni/build/ConfigureMakeInstall.scala index 7bfedae..27550a8 100644 --- a/plugin/src/main/scala/ch/jodersky/sbt/jni/build/ConfigureMakeInstall.scala +++ b/plugin/src/main/scala/ch/jodersky/sbt/jni/build/ConfigureMakeInstall.scala @@ -19,7 +19,7 @@ trait ConfigureMakeInstall { self: BuildTool => def configure(targetDirectory: File): ProcessBuilder - def make(): ProcessBuilder = Process("make", buildDirectory) + def make(): ProcessBuilder = Process("make VERBOSE=1", buildDirectory) def install(): ProcessBuilder = Process("make install", buildDirectory) |