From 714a472e775b2e7d65e95051cd1862bde6791211 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 12 Oct 2017 10:20:29 +0200
Subject: [PATCH] Fixed compilation of JNI layer of Java wrapper

---
 CMakeLists.txt               |  6 +++---
 coreapi/CMakeLists.txt       |  6 ++----
 wrappers/java/CMakeLists.txt | 13 ++++++-------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a16203a69..c7d648143 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -335,6 +335,9 @@ endif()
 
 add_subdirectory(include)
 add_subdirectory(java)
+if(ENABLE_JAVA_WRAPPER)
+	add_subdirectory(wrappers/java)
+endif()
 add_subdirectory(src)
 add_subdirectory(coreapi)
 add_subdirectory(share)
@@ -356,9 +359,6 @@ endif()
 if(ENABLE_CSHARP_WRAPPER)
 	add_subdirectory(wrappers/csharp)
 endif()
-if(ENABLE_JAVA_WRAPPER)
-	add_subdirectory(wrappers/java)
-endif()
 
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 4397e036a..d4faf04cc 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -112,9 +112,8 @@ set(LINPHONE_SOURCE_FILES_CXX
 	tester_utils.cpp
 )
 set(LINPHONE_INCLUDE_DIRS ${LINPHONE_INCLUDE_DIRS})
-if(ANDROID)
-	list(APPEND LINPHONE_SOURCE_FILES_CXX linphonecore_jni.cc)
-	set_source_files_properties(linphonecore_jni.cc PROPERTIES COMPILE_DEFINITIONS "USE_JAVAH")
+if(ENABLE_JAVA_WRAPPER)
+	list(APPEND LINPHONE_SOURCE_FILES_CXX ${LINPHONE_JNI_SOURCES})
 endif()
 
 set(LINPHONE_SOURCE_FILES_OBJC)
@@ -255,7 +254,6 @@ if(ENABLE_SHARED)
 		set_target_properties(linphone PROPERTIES PREFIX "lib")
 	elseif(ANDROID)
 		target_link_libraries(linphone PUBLIC "log" ${SUPPORT_LIBRARIES} ${CPUFEATURES_LIBRARIES})
-		add_dependencies(linphone linphonecore-jni-header)
 	endif()
 	if(MSVC)
 		if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
diff --git a/wrappers/java/CMakeLists.txt b/wrappers/java/CMakeLists.txt
index 18712607a..78c6a1e1a 100644
--- a/wrappers/java/CMakeLists.txt
+++ b/wrappers/java/CMakeLists.txt
@@ -20,9 +20,9 @@
 #
 ############################################################################
 
-add_custom_command(OUTPUT linphone_jni.cc
-	COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/genwrapper.py" "${PROJECT_BINARY_DIR}/coreapi/help/doc/doxygen/xml"
-	DEPENDS ${PROJECT_SOURCE_DIR}/tools/genapixml.py
+add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/src/linphone_jni.cc"
+	COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/genwrapper.py" "${PROJECT_BINARY_DIR}/coreapi/help/doc/doxygen/xml" "-o" "${CMAKE_CURRENT_BINARY_DIR}"
+	DEPENDS ${PROJECT_SOURCE_DIR}/tools/genapixml.py ${LINPHONE_HEADER_FILES}
 	${PROJECT_SOURCE_DIR}/tools/metadoc.py
 	${PROJECT_SOURCE_DIR}/tools/abstractapi.py
 	genwrapper.py
@@ -33,10 +33,9 @@ add_custom_command(OUTPUT linphone_jni.cc
 	jni.mustache
 	linphone-doc
 	"${PROJECT_BINARY_DIR}/coreapi/help/doc/doxygen/xml/index.xml"
+	COMMENT "Generating java wrapper"
 )
 
-add_custom_target(linphonej ALL DEPENDS linphone_jni.cc)
+add_custom_target(linphonej ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/src/linphone_jni.cc")
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/linphone_jni.cc
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/linphonej
-)
+set(LINPHONE_JNI_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/src/linphone_jni.cc" PARENT_SCOPE)
\ No newline at end of file