API: Use string type instead of u8.

[vpp.git] / extras / japi / CMakeLists.txt

diff --git a/extras/japi/CMakeLists.txt b/extras/japi/CMakeLists.txt
index a0bcf5e..274dd07 100644 (file)
--- a/extras/japi/CMakeLists.txt
+++ b/extras/japi/CMakeLists.txt
@@ -13,7 +13,7 @@
 
 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
-project(japi VERSION 18.10)
+project(japi)
 
 include(CheckCCompilerFlag)
 
@@ -28,15 +28,50 @@ if (compiler_flag_no_address_of_packed_member)
   add_definitions(-Wno-address-of-packed-member)
 endif()
 
+execute_process(
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../src
+  COMMAND scripts/version
+  OUTPUT_VARIABLE JAPI_VERSION
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+string(REPLACE "-" ";" JAPI_LIB_VERSION ${JAPI_VERSION})
+list(GET JAPI_LIB_VERSION 0 JAPI_LIB_VERSION)
+
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 set(CMAKE_INSTALL_MESSAGE NEVER)
 
 find_package(Threads REQUIRED)
+
+unset(dirlist)
+
+macro(subdirlist dirlist dirpath)
+  file(GLOB dirs RELATIVE ${dirpath} ${dirpath}/*)
+  foreach(dir ${dirs})
+    if(IS_DIRECTORY ${dirpath}/${dir})
+      list(APPEND dirlist ${dirpath}/${dir})
+    endif()
+  endforeach()
+endmacro()
+
+list(APPEND dirlist $ENV{JAVA_HOME})
+subdirlist(dirlist /usr/lib/jvm)
+subdirlist(dirlist /usr/lib64/jvm)
+
+unset(JAVA_HOME_SET)
+find_path(JAVA_HOME_SET NAMES include/jni.h PATHS ${dirlist})
+if (NOT JAVA_HOME_SET)
+  message("JAVA_HOME is not found")
+else()
+  set(ENV{JAVA_HOME} "${JAVA_HOME_SET}")
+endif()
+
+message("JAVA_HOME: $ENV{JAVA_HOME}")
+
 find_package(Java 1.8 REQUIRED COMPONENTS Development)
-find_package(JNI REQUIRED)
+get_filename_component(jvm_path ${Java_JAVAC_EXECUTABLE} DIRECTORY)
+set (Java_INCLUDE_DIRS ${jvm_path}/../include ${jvm_path}/../include/linux)
 
-message("Found java headers ${JNI_INCLUDE_DIRS}")
+message("Found java headers ${Java_INCLUDE_DIRS}")
 message("Found javac at: " ${Java_JAVAC_EXECUTABLE})
-
 add_subdirectory(java)