Blob Blame History Raw
From 91a51562ff0bdec6af398d7dcd40e2d3c364dd77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <me@besser82.io>
Date: Wed, 17 Feb 2016 15:12:56 +0100
Subject: [PATCH] make (JAVA|JNI)_INSTALL_DIR configurable

---
 src/interfaces/java_modular/CMakeLists.txt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/interfaces/java_modular/CMakeLists.txt b/src/interfaces/java_modular/CMakeLists.txt
index 85401d2..7b78481 100644
--- a/src/interfaces/java_modular/CMakeLists.txt
+++ b/src/interfaces/java_modular/CMakeLists.txt
@@ -21,12 +21,20 @@ ADD_CUSTOM_COMMAND(TARGET java_modular POST_BUILD
 #ADD_JAR(shogun_jar "${CMAKE_CURRENT_BINARY_DIR}/*.java")
 #add_dependencies(shogun_jar java_modular)
 
+IF(NOT JAVA_INSTALL_DIR)
+	SET(JAVA_INSTALL_DIR "share/java")
+ENDIF(NOT JAVA_INSTALL_DIR)
+
+IF(NOT JNI_INSTALL_DIR)
+	SET(JNI_INSTALL_DIR "lib/cli/shogun")
+ENDIF(NOT JNI_INSTALL_DIR)
+
 SET(JAVA_MODULAR_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
 INSTALL(TARGETS java_modular
-	LIBRARY DESTINATION lib/jni
+	LIBRARY DESTINATION ${JNI_INSTALL_DIR}
 	COMPONENT java)
 
 SET(SHOGUN_JAR "${CMAKE_CURRENT_BINARY_DIR}/shogun.jar" PARENT_SCOPE)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/shogun.jar
-		DESTINATION share/java
+		DESTINATION ${JAVA_INSTALL_DIR}
 		COMPONENT java)