swig handling

packages/swig/java/CMakeLists.txt

@@ -2,9 +2,9 @@
 
 macro_optional_find_package(Java ON)
 
- find_package(Java COMPONENTS Development)
+ find_package(Java COMPONENTS Runtime Development)
  #find_package(Java COMPONENTS Runtime)
- 
+
 macro_log_feature (Java_Development_FOUND "Java"
     "Use Java System"
     "http://www.java.org" FALSE)
@@ -17,54 +17,78 @@ macro_optional_find_package(JNI ON)
 if (Java_Development_FOUND)
 
     include ( UseJava  )
+    include ( UseSWIG  )
+
 
-    
   #  SET(CMAKE_SWIG_FLAGS -package YAP)
 
-    SET(SWIG_SOURCES 
+    set (CMAKE_SWIG_OUTDIR  ${CMAKE_CURRENT_BINARY_DIR} )
+
+    SET(SWIG_SOURCES
       ../yap.i
       )
 
-    set( CMAKE_CXX_FAGS "${CMAKE_CXX_FLAGS} -Wno-missing-declarations")
+   #set (CMAKE_JAVA_CLASS_OUTPUT_PATH java)
 
-   include_directories (
-ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ       ${CMAKE_CURRENT_SOURCE_DIR}
-      ${JAVA_INCLUDE_DIRS}
-      ${JNI_INCLUDE_DIRS}
-      )
-    set (CMAKE_SWIG_OUTDIR  ${CMAKE_CURRENT_BINARY_DIR} )
-
-    #set (CMAKE_JAVA_CLASS_OUTPUT_PATH java)
 
     SET_SOURCE_FILES_PROPERTIES(${SWIG_SOURCES} PROPERTIES CPLUSPLUS ON)
-    
-  #  SWIG_ADD_MODULE(jSWIG java  ${SWIG_SOURCES} )
 
-  #  SWIG_LINK_LIBRARIES(jSWIG ${JAVA_LIBRARIES} ${JNI_LIBRARIES} Yap++)
 
-    set_source_files_properties(../yap.i PROPERTY CPLUSPLUS ON)
+  include_directories (
+    ${CMAKE_SOURCE_DIR}/CXX
+    ${JAVA_INCLUDE_DIRS}
+    ${JNI_INCLUDE_DIRS}
+      )
 
-   add_jar(JavaYAP
-     SOURCES JavaYAP.java
-     ENTRY_POINT JavaYAP
-     )
-   install_jar(JavaYAP ${libpl}/JavaYAP)
+    if ( ${C_COMPILER} MATCHES "Clang")
+      set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-prototypes")
+    endif()
+    if ( ${C_COMPILER} MATCHES "GNU")
+      set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-declarations")
+    endif()
+    #SET(CMAKE_SWIG_FLAGS "${CMAKE_SWIG_FLAGS} ")
 
-   set(CMAKE_JNI_TARGET TRUE)
-   ADD_CUSTOM_COMMAND(TARGET JavaYAP
-     POST_BUILD
+    SWIG_ADD_MODULE(Native java ${SWIG_SOURCES}
+	   )
+
+	add_dependencies(Native Yap++ )
+	 
+    SWIG_LINK_LIBRARIES (Native Yap++ )
+      
+
+   set(CMAKE_JNI_TARGET 1)
+    ADD_JAR( NativeJar
+      SOURCES "../../../misc/icons/yap_16x16x32.png"
+      DEPENDS Native
+      PROPERTIES OUTPUT_NAME Native
+      )
+    install_jar(NativeJar ${libpl})
+    	add_dependencies(NativeJar Native )
+    #install_jni_symlink(NativeJar  .)
+
+
+    ADD_CUSTOM_COMMAND(TARGET NativeJar
+      POST_BUILD
      COMMAND cmake -E echo "Compiling Java files..."
-     COMMAND ${Java_JAVAC_EXECUTABLE} *.java
+     COMMAND ${Java_JAVAC_EXECUTABLE} *.java -cp .
      COMMAND cmake -E echo "Creating jar file..."
-     COMMAND ${Java_JAR_EXECUTABLE} uvf JavaYAP.jar *.class
+     COMMAND ${Java_JAR_EXECUTABLE} -ufM Native.jar *.class
      )
-#    install_jni_symlink(shibboleet ${JAVA_LIB_INSTALL_DIR})
 
-#      SET_TARGET_PROPERTIES(jSWIG PROPERTIES OUTPUT_NAME "JavaYAP")
-  
+   ADD_JAR( JavaYAP
+     SOURCES "JavaYAP.java"
+     ENTRY_POINT JavaYAP
+     INCLUDE_JARS NativeJar )
+   SET(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.8" "-target" "1.8")
+install(    TARGETS Native  
+    RUNTIME DESTINATION ${bindir}
+    ARCHIVE  DESTINATION ${libdir}
+    LIBRARY  DESTINATION ${libdir}
+)
+
+install_jar(JavaYAP ${libpl})
+#install_jni_symlink(JavaYAP ${libpl})
+
 
-#   add_dependencies(jSWIG JavaYAP)
 
  Endif (Java_Development_FOUND)
-
-