Repository: orc Updated Branches: refs/heads/master c9de6f4e4 -> b48c73b3d
ORC-283: Enable the cmake build to pick specified libraries over the default libraries Fixes #204 Signed-off-by: Deepak Majeti <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/b48c73b3 Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/b48c73b3 Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/b48c73b3 Branch: refs/heads/master Commit: b48c73b3ddd91f5a69b430a7b71f34cad1b16d3b Parents: c9de6f4 Author: Deepak Majeti <[email protected]> Authored: Thu Dec 21 17:47:12 2017 +0530 Committer: Deepak Majeti <[email protected]> Committed: Thu Jan 11 23:27:57 2018 +0530 ---------------------------------------------------------------------- cmake_modules/FindGTest.cmake | 2 +- cmake_modules/FindLZ4.cmake | 2 +- cmake_modules/FindProtobuf.cmake | 4 ++-- cmake_modules/FindSnappy.cmake | 2 +- cmake_modules/FindZLIB.cmake | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/b48c73b3/cmake_modules/FindGTest.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/FindGTest.cmake b/cmake_modules/FindGTest.cmake index c877e60..3ae8954 100644 --- a/cmake_modules/FindGTest.cmake +++ b/cmake_modules/FindGTest.cmake @@ -28,7 +28,7 @@ find_path (GTEST_INCLUDE_DIR gmock/gmock.h HINTS NO_DEFAULT_PATH PATH_SUFFIXES "include") -find_library (GTEST_LIBRARIES NAMES gmock PATHS +find_library (GTEST_LIBRARIES NAMES gmock HINTS ${_gtest_path} PATH_SUFFIXES "lib") http://git-wip-us.apache.org/repos/asf/orc/blob/b48c73b3/cmake_modules/FindLZ4.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/FindLZ4.cmake b/cmake_modules/FindLZ4.cmake index 6695167..581ebcb 100644 --- a/cmake_modules/FindLZ4.cmake +++ b/cmake_modules/FindLZ4.cmake @@ -28,7 +28,7 @@ find_path (LZ4_INCLUDE_DIR lz4.h HINTS NO_DEFAULT_PATH PATH_SUFFIXES "include") -find_library (LZ4_LIBRARIES NAMES lz4 PATHS +find_library (LZ4_LIBRARIES NAMES lz4 HINTS ${_lz4_path} PATH_SUFFIXES "lib") http://git-wip-us.apache.org/repos/asf/orc/blob/b48c73b3/cmake_modules/FindProtobuf.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/FindProtobuf.cmake b/cmake_modules/FindProtobuf.cmake index 73e39f2..d901c55 100644 --- a/cmake_modules/FindProtobuf.cmake +++ b/cmake_modules/FindProtobuf.cmake @@ -36,11 +36,11 @@ find_path (PROTOBUF_INCLUDE_DIR google/protobuf/io/coded_stream.h HINTS NO_DEFAULT_PATH PATH_SUFFIXES "include") -find_library (PROTOBUF_LIBRARY NAMES protobuf PATHS +find_library (PROTOBUF_LIBRARY NAMES protobuf HINTS ${_protobuf_path} PATH_SUFFIXES "lib") -find_library (PROTOC_LIBRARY NAMES protoc PATHS +find_library (PROTOC_LIBRARY NAMES protoc HINTS ${_protobuf_path} PATH_SUFFIXES "lib") http://git-wip-us.apache.org/repos/asf/orc/blob/b48c73b3/cmake_modules/FindSnappy.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake index 233ffb0..6cf64be 100644 --- a/cmake_modules/FindSnappy.cmake +++ b/cmake_modules/FindSnappy.cmake @@ -28,7 +28,7 @@ find_path (SNAPPY_INCLUDE_DIR snappy.h HINTS NO_DEFAULT_PATH PATH_SUFFIXES "include") -find_library (SNAPPY_LIBRARIES NAMES snappy PATHS +find_library (SNAPPY_LIBRARIES NAMES snappy HINTS ${_snappy_path} PATH_SUFFIXES "lib") http://git-wip-us.apache.org/repos/asf/orc/blob/b48c73b3/cmake_modules/FindZLIB.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/FindZLIB.cmake b/cmake_modules/FindZLIB.cmake index 10aef8f..6d29c55 100644 --- a/cmake_modules/FindZLIB.cmake +++ b/cmake_modules/FindZLIB.cmake @@ -28,7 +28,7 @@ find_path (ZLIB_INCLUDE_DIR zlib.h HINTS NO_DEFAULT_PATH PATH_SUFFIXES "include") -find_library (ZLIB_LIBRARIES NAMES z PATHS +find_library (ZLIB_LIBRARIES NAMES z HINTS ${_zlib_path} PATH_SUFFIXES "lib")
