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/07/01 17:56:17 UTC

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

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/4432dcf4
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/4432dcf4
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/4432dcf4

Branch: refs/heads/branch-1.1
Commit: 4432dcf49121f9ad51a23d455edef63985df228b
Parents: 6548dee
Author: Deepak Majeti <de...@hpe.com>
Authored: Tue Jun 28 11:27:57 2016 -0400
Committer: Owen O'Malley <om...@apache.org>
Committed: Fri Jul 1 09:29:11 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/4432dcf4/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e54078..1f87974 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,10 @@ SET(CPACK_PACKAGE_VERSION_MINOR "1")
 SET(CPACK_PACKAGE_VERSION_PATCH "2-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/4432dcf4/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
+
+```