commit aa7d0d5f2a9e8b201e8d0f5a37f420b9846e4625
author Nobuaki Sukegawa <nsuke@apache.org> Sat Feb 27 03:04:34 2016 +0900
committer Nobuaki Sukegawa <nsuke@apache.org> Sat Feb 27 16:55:55 2016 +0900
tree c83ca59c05bd5277df77b7b5537c4b018a8d783e
parent 6bbc9e3a60014a3f5e0c26c842f7d345935bfe0d

THRIFT-3677 Improve CMake Java build

This closes #897

lib/java/CMakeLists.txt

diff --git a/lib/java/CMakeLists.txt b/lib/java/CMakeLists.txt
index 2014f5c..57b97f1 100644
--- a/lib/java/CMakeLists.txt
+++ b/lib/java/CMakeLists.txt
@@ -28,7 +28,7 @@
     set(THRIFT_AAR outputs/aar/thrift-debug.aar outputs/aar/thrift-release.aar)
     add_custom_command(
         OUTPUT ${THRIFT_AAR}
-        COMMAND ${GRADLE_EXECUTABLE} -p${CMAKE_CURRENT_SOURCE_DIR}/android -PbuildDir=${CMAKE_CURRENT_BINARY_DIR} assemble
+        COMMAND ${GRADLE_EXECUTABLE} -p"${CMAKE_CURRENT_SOURCE_DIR}/android" -PbuildDir="${CMAKE_CURRENT_BINARY_DIR}" assemble
         DEPENDS ${java_sources} ${android_sources})
     add_custom_target(thrift_aar ALL DEPENDS ${THRIFT_AAR})
 
@@ -46,21 +46,35 @@
         set(JAVA_DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}/java")
     endif()
 
-    add_custom_target(ant_build ALL
-        COMMAND ${Ant_EXECUTABLE} ${ANT_FLAGS} -Dbuild.dir=${CMAKE_CURRENT_BINARY_DIR} -Dworking.dir=${work_dir} -f build.xml
+    file(GLOB_RECURSE ThriftJava_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.java)
+    set(ThriftJava_ARTIFACTS
+        libthrift-${thrift_VERSION}.jar
+        libthrift-${thrift_VERSION}.pom
+    )
+    add_custom_command(
+        OUTPUT ${ThriftJava_ARTIFACTS}
+        COMMAND ${Ant_EXECUTABLE} ${ANT_FLAGS} -Dbuild.dir="${CMAKE_CURRENT_BINARY_DIR}" -f build.xml
+        MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/build.xml
+        DEPENDS ${ThriftJava_SOURCES}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+
+    add_custom_target(ThriftJava ALL
         COMMENT "Building Java library using Ant"
+        DEPENDS ${ThriftJava_ARTIFACTS}
     )
 
     # Hook the ant install task into CMake install
     install(CODE "execute_process(
         COMMAND ${Ant_EXECUTABLE} ${ANT_FLAGS} install
-        -Dbuild.dir=${CMAKE_CURRENT_BINARY_DIR} -Dworking.dir=${work_dir}
-        -Dinstall.path=${JAVA_INSTALL_DIR} -Dinstall.javadoc.path=${JAVA_DOC_INSTALL_DIR} -f build.xml
+        -Dbuild.dir=\"${CMAKE_CURRENT_BINARY_DIR}\"
+        -Dinstall.path=\"${JAVA_INSTALL_DIR}\" -Dinstall.javadoc.path=\"${JAVA_DOC_INSTALL_DIR}\" -f build.xml
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     )")
 
     if(BUILD_TESTING)
-        #add_subdirectory(test)
+        add_test(NAME JavaTest
+                 COMMAND ${Ant_EXECUTABLE} ${ANT_FLAGS} -Dbuild.dir="${CMAKE_CURRENT_BINARY_DIR}" -Dthrift.compiler="${THRIFT_COMPILER}" -f build.xml test
+                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
     endif()
 endif(ANDROID)