ORC-268: Enable the cmake build to use apt-get installed components.

Fixes #194 Signed-off-by: Owen O'Malley <owen@hortonworks.com>
apache · Nov 30, 2017 · f401d94 · f401d94
1 parent e510ab6
commit f401d94
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,6 +55,8 @@ endif ()
 
 # Set the package format
 SET(CPACK_GENERATOR "TGZ")
+SET(CPACK_PACKAGE_VENDOR "Apache ORC")
+SET(CPACK_PACKAGE_CONTACT "Apache ORC <dev@orc.apache.org>")
 
 INCLUDE(CPack)
 INCLUDE(ExternalProject)

diff --git a/cmake_modules/FindGTest.cmake b/cmake_modules/FindGTest.cmake
@@ -30,7 +30,6 @@ find_path (GTEST_INCLUDE_DIR gmock/gmock.h HINTS
 
 find_library (GTEST_LIBRARIES NAMES gmock PATHS
   ${_gtest_path}
-  NO_DEFAULT_PATH
   PATH_SUFFIXES "lib")
 
 if (GTEST_INCLUDE_DIR AND GTEST_LIBRARIES)

diff --git a/cmake_modules/FindLZ4.cmake b/cmake_modules/FindLZ4.cmake
@@ -30,7 +30,6 @@ find_path (LZ4_INCLUDE_DIR lz4.h HINTS
 
 find_library (LZ4_LIBRARIES NAMES lz4 PATHS
   ${_lz4_path}
-  NO_DEFAULT_PATH
   PATH_SUFFIXES "lib")
 
 if (LZ4_INCLUDE_DIR AND LZ4_LIBRARIES)

diff --git a/cmake_modules/FindProtobuf.cmake b/cmake_modules/FindProtobuf.cmake
@@ -38,12 +38,10 @@ find_path (PROTOBUF_INCLUDE_DIR google/protobuf/io/coded_stream.h HINTS
 
 find_library (PROTOBUF_LIBRARY NAMES protobuf PATHS
   ${_protobuf_path}
-  NO_DEFAULT_PATH
   PATH_SUFFIXES "lib")
 
 find_library (PROTOC_LIBRARY NAMES protoc PATHS
   ${_protobuf_path}
-  NO_DEFAULT_PATH
   PATH_SUFFIXES "lib")
 
 find_program(PROTOBUF_EXECUTABLE protoc HINTS

diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake
@@ -30,7 +30,6 @@ find_path (SNAPPY_INCLUDE_DIR snappy.h HINTS
 
 find_library (SNAPPY_LIBRARIES NAMES snappy PATHS
   ${_snappy_path}
-  NO_DEFAULT_PATH
   PATH_SUFFIXES "lib")
 
 if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)

diff --git a/cmake_modules/FindZLIB.cmake b/cmake_modules/FindZLIB.cmake
@@ -30,7 +30,6 @@ find_path (ZLIB_INCLUDE_DIR zlib.h HINTS
 
 find_library (ZLIB_LIBRARIES NAMES z PATHS
   ${_zlib_path}
-  NO_DEFAULT_PATH
   PATH_SUFFIXES "lib")
 
 if (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARIES)