Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion cmake_modules/FindGTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion cmake_modules/FindLZ4.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions cmake_modules/FindProtobuf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion cmake_modules/FindSnappy.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion cmake_modules/FindZLIB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down