You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2015/02/02 21:48:19 UTC
thrift git commit: THRIFT-2850 CMake: Fixed Java lib build enable -
Ant required to build java part of Thrift
Repository: thrift
Updated Branches:
refs/heads/master 97c4398c3 -> 9d8c1bf6f
THRIFT-2850 CMake: Fixed Java lib build enable - Ant required to build java part of Thrift
This closes: #365
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/9d8c1bf6
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/9d8c1bf6
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/9d8c1bf6
Branch: refs/heads/master
Commit: 9d8c1bf6f62c22c13c5b6b4da51b1de1a9d27339
Parents: 97c4398
Author: Sergei Nikulov <se...@gmail.com>
Authored: Fri Jan 30 13:29:33 2015 +0300
Committer: Roger Meier <ro...@apache.org>
Committed: Mon Feb 2 21:47:14 2015 +0100
----------------------------------------------------------------------
cmake/DefineOptions.cmake | 3 ++-
lib/java/CMakeLists.txt | 3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/9d8c1bf6/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 @@ CMAKE_DEPENDENT_OPTION(WITH_C_GLIB "Build C (GLib) library" ON
"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)
http://git-wip-us.apache.org/repos/asf/thrift/blob/9d8c1bf6/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()