commit 9d8c1bf6f62c22c13c5b6b4da51b1de1a9d27339
author Sergei Nikulov <sergey.nikulov@gmail.com> Fri Jan 30 13:29:33 2015 +0300
committer Roger Meier <roger@apache.org> Mon Feb 02 21:47:14 2015 +0100
tree 62df6a4fd31018be85fa2faea2d582eb3e5a5c22
parent 97c4398c382342a19920693a6318826c66fe7b7f

THRIFT-2850 CMake: Fixed Java lib build enable - Ant required to build java part of Thrift

This closes: #365

cmake/DefineOptions.cmake

diff --git a/cmake/DefineOptions.cmake b/cmake/DefineOptions.cmake
index 391247e..457deb6 100644
--- a/cmake/DefineOptions.cmake
+++ b/cmake/DefineOptions.cmake
@@ -69,8 +69,9 @@
                        "BUILD_LIBRARIES;GLIB_FOUND" OFF)
 # Java
 find_package(Java QUIET)
+find_package(Ant QUIET)
 CMAKE_DEPENDENT_OPTION(WITH_JAVA "Build Java library" ON
-                       "BUILD_LIBRARIES;JAVA_FOUND" OFF)
+                       "BUILD_LIBRARIES;JAVA_FOUND;Ant_FOUND" OFF)
 
 # Common library options
 option(WITH_SHARED_LIB "Build shared libraries" ON)

lib/java/CMakeLists.txt

diff --git a/lib/java/CMakeLists.txt b/lib/java/CMakeLists.txt
index 8306318..e915078 100644
--- a/lib/java/CMakeLists.txt
+++ b/lib/java/CMakeLists.txt
@@ -20,9 +20,6 @@
 
 cmake_minimum_required(VERSION 2.8)
 
-# Find required packages
-find_package(Ant REQUIRED)
-
 if(IS_ABSOLUTE "${LIB_INSTALL_DIR}")
     set(JAVA_INSTALL_DIR "${LIB_INSTALL_DIR}/java")
 else()