You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by da...@apache.org on 2017/11/03 20:53:13 UTC
kudu git commit: cmake: require Java in non-test builds
Repository: kudu
Updated Branches:
refs/heads/master e2509a4bd -> 3e821ced2
cmake: require Java in non-test builds
The mini-HMS is being built as part of the Kudu mini-cluster tool, which
necessitates Java being available during non-test builds of the C++
project.
Change-Id: I2801e80924168c75f0c82582e8f99fa7e537d4fd
Reviewed-on: http://gerrit.cloudera.org:8080/8460
Reviewed-by: Todd Lipcon <to...@apache.org>
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/3e821ced
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/3e821ced
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/3e821ced
Branch: refs/heads/master
Commit: 3e821ced2a79e4281b05b8903ee5305979ef322e
Parents: e2509a4
Author: Dan Burkert <da...@apache.org>
Authored: Fri Nov 3 14:20:41 2017 -0400
Committer: Dan Burkert <da...@apache.org>
Committed: Fri Nov 3 20:52:52 2017 +0000
----------------------------------------------------------------------
CMakeLists.txt | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/3e821ced/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 478bf5e..587d700 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -863,14 +863,12 @@ ADD_THIRDPARTY_LIB(thrift
STATIC_LIB "${THRIFT_STATIC_LIBRARY}"
SHARED_LIB "${THRIFT_SHARED_LIBRARY}")
-if (NOT NO_TESTS)
- # The HMS tests rely on JAVA_HOME being set in order to run the HMS, and
- # the JDK 1.7 or later for compiling the Kudu metastore plugin.
- find_package(JavaHome REQUIRED)
- find_package(Java 1.7 REQUIRED)
- # Defines the add_jar() CMake command.
- include(UseJava)
-endif()
+# The mini-HMS relies on JAVA_HOME being set in order to run the HMS, and
+# JDK 1.7 or later for compiling the Kudu metastore plugin.
+find_package(JavaHome REQUIRED)
+find_package(Java 1.7 REQUIRED)
+# Defines the add_jar() CMake command.
+include(UseJava)
## Snappy
find_package(Snappy REQUIRED)