updated swig build scripts

Author: rssdev10

swig/CMakeLists.txt

@@ -3,6 +3,7 @@ project(Julia4J VERSION 0.0.0.1 LANGUAGES C)
 
 find_package(SWIG REQUIRED)
 include(${SWIG_USE_FILE})
+#find_package(Java COMPONENTS Development)
 find_package(JNI REQUIRED)
 
 include(./FindJULIA.cmake)
@@ -24,6 +25,8 @@ set_target_properties(julia4j PROPERTIES
 target_include_directories(julia4j PUBLIC ${JNI_INCLUDE_DIRS} ${Julia_INCLUDE_DIRS})
 target_link_libraries(julia4j ${JNI_LIBRARIES} ${Julia_LIBRARY} ${Julia_LIBRARY_DIR})
 
+# set(CMAKE_INSTALL_RPATH "@loader_path")
+
 string(TOLOWER ${CMAKE_SYSTEM_NAME} OUT_OS_NAME)
 install (TARGETS julia4j #${PROJECT_NAME}
        LIBRARY DESTINATION ${PROJECT_SOURCE_DIR}/../src/main/resources/native/64/${OUT_OS_NAME}/

swig/build.sh

@@ -1,7 +1,21 @@
-JULIA_JAVA_PATH=`pwd`/../../src/main/java/org/julia/jni/swig
+JULIA_JAVA_PATH=`pwd`/../src/main/java/org/julia/jni/swig
 rm $JULIA_JAVA_PATH/*.java
 
-cmake .
-make
+# if [ -z "$JAVA_HOME" ]; then
+#   IFS=' = '
+#   # java -XshowSettings:properties -version 2>&1 | findstr "java.home" # winver
+#   JAVA_PROP=`java -XshowSettings:properties -version 2>&1 > /dev/null | grep 'java.home'`
+#   read -a strarr <<< "$JAVA_PROP"
+#   export JAVA_HOME="${strarr[1]}"
+# # export JAVA_INCLUDE_PATH="$JAVA_HOME/include"
+#   export JAVA_JVM_LIBRARY="$JAVA_HOME/lib"
+# fi
 
-mv libjulia4j.jnilib ../src/main/resources/native/64/darwin/
+echo $JAVA_HOME
+#echo $JAVA_INCLUDE_PATH
+
+# cmake . && \
+# make && \
+# mv libjulia4j.jnilib ../src/main/resources/native/64/darwin/
+
+cmake . && make clean && make install