fixing java wrapper build on ubuntu

ukaea · Dec 4, 2023 · 0cfbe48 · 0cfbe48
1 parent fb553a7
commit 0cfbe48
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/cmake/plugins.cmake b/cmake/plugins.cmake
@@ -102,7 +102,6 @@ macro( uda_plugin )
   filter_lib_list( "${PLUGIN_EXTRA_LINK_LIBS}" FILTERED_LINK_LIBS debug optimized ) 
   set( LIBRARIES ${LIBRARIES} ${FILTERED_LINK_LIBS} )
 
-  message( WARNING ">>>> ${PLUGIN_LIBNAME} ${LIBRARIES}" ) 
   target_link_libraries( ${PLUGIN_LIBNAME} PRIVATE ${LIBRARIES} )
 
   install(

diff --git a/source/include/udaStructs.h b/source/include/udaStructs.h
@@ -5,6 +5,8 @@
 #  include <sys/time.h>
 #endif
 
+#include <stdbool.h>
+
 #include "udaDefines.h"
 #include "export.h"
 //#include "clientserver/parseXML.h"

diff --git a/source/wrappers/java/CMakeLists.txt b/source/wrappers/java/CMakeLists.txt
@@ -18,10 +18,11 @@ endif()
 
 include( UseJava )
 
-set( CMAKE_JAVA_COMPILE_FLAGS "-source" "1.6" "-target" "1.6" )
+set( CMAKE_JAVA_COMPILE_FLAGS "-source" "8" "-target" "8" )
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/source
+  ${CMAKE_SOURCE_DIR}/source/include
   ${JNI_INCLUDE_DIRS}
   ${LIBXML2_INCLUDE_DIR}
 )

diff --git a/source/wrappers/java/idam_jni.c b/source/wrappers/java/idam_jni.c
@@ -7,10 +7,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <client/udaGetAPI.h>
-#include <client/udaClient.h>
-#include <client/accAPI.h>
-#include <clientserver/udaTypes.h>
+#include <udaGetAPI.h>
+#include <client.h>
+#include <accAPI.h>
+#include <udaTypes.h>
 
 // Java native methods