From e9ae890252fb1924dd4bbe102336181108462858 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Tue, 7 Jun 2016 14:58:31 -0700 Subject: Update paramaters passed to CMake from sbt --- plugin/src/main/scala/ch/jodersky/sbt/jni/build/CMake.scala | 4 ++-- .../main/scala/ch/jodersky/sbt/jni/build/ConfigureMakeInstall.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugin/src/main/scala') 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) -- cgit v1.2.3