You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2016/06/29 17:35:40 UTC

orc git commit: ORC-71: Add BUILD_JAVA cmake option that can disable the Java build. (Sudhir Babu Pothineni via omalley)

Repository: orc
Updated Branches:
  refs/heads/master 496d20402 -> d9d529bcf


ORC-71: Add BUILD_JAVA cmake option that can disable the Java
build. (Sudhir Babu Pothineni via omalley)

Signed-off-by: Owen O'Malley <om...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/d9d529bc
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/d9d529bc
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/d9d529bc

Branch: refs/heads/master
Commit: d9d529bcf7f48e1bb1e95042f70bdaf17d7ef7fb
Parents: 496d204
Author: Deepak Majeti <de...@hpe.com>
Authored: Tue Jun 28 11:27:57 2016 -0400
Committer: Owen O'Malley <om...@apache.org>
Committed: Wed Jun 29 10:34:50 2016 -0700

----------------------------------------------------------------------
 CMakeLists.txt |  8 +++++++-
 README.md      | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/orc/blob/d9d529bc/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 193ad5d..0b3d831 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,10 @@ SET(CPACK_PACKAGE_VERSION_MINOR "2")
 SET(CPACK_PACKAGE_VERSION_PATCH "0-SNAPSHOT")
 SET(ORC_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
+option (BUILD_JAVA
+    "Include ORC Java library in the build process"
+     ON)
+
 # Make sure that a build type is selected
 if (NOT CMAKE_BUILD_TYPE)
   message(STATUS "No build type selected, default to ReleaseWithDebugInfo")
@@ -105,7 +109,9 @@ set (EXAMPLE_DIRECTORY ${CMAKE_SOURCE_DIR}/examples)
 
 add_subdirectory(c++)
 add_subdirectory(tools)
-add_subdirectory(java)
+if (BUILD_JAVA)
+  add_subdirectory(java)
+endif()
 
 # Add another target called test-out that prints the results on failure
 if (CMAKE_CONFIGURATION_TYPES)

http://git-wip-us.apache.org/repos/asf/orc/blob/d9d529bc/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 2ea9a88..349d0b3 100644
--- a/README.md
+++ b/README.md
@@ -62,3 +62,13 @@ To build only the Java library:
 % mvn package
 
 ```
+
+To build only the C++ library:
+```shell
+% mkdir build
+% cd build
+% cmake .. -DBUILD_JAVA=OFF
+% make package
+% make test-out
+
+```