Repository: arrow Updated Branches: refs/heads/master c99661069 -> 3a99f39d6
ARROW-73: Support older CMake versions Author: Uwe L. Korn <uw...@xhochy.com> Closes #31 from xhochy/arrow-73 and squashes the following commits: c92ce5c [Uwe L. Korn] ARROW-73: Support older CMake versions Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/3a99f39d Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/3a99f39d Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/3a99f39d Branch: refs/heads/master Commit: 3a99f39d64d4e0d6556582c0560140c7b06ee21d Parents: c996610 Author: Uwe L. Korn <uw...@xhochy.com> Authored: Mon Mar 21 16:31:21 2016 -0700 Committer: Wes McKinney <w...@apache.org> Committed: Mon Mar 21 16:31:21 2016 -0700 ---------------------------------------------------------------------- cpp/cmake_modules/FindGTest.cmake | 2 +- cpp/cmake_modules/FindParquet.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/3a99f39d/cpp/cmake_modules/FindGTest.cmake ---------------------------------------------------------------------- diff --git a/cpp/cmake_modules/FindGTest.cmake b/cpp/cmake_modules/FindGTest.cmake index e47faf0..3c5d2b6 100644 --- a/cpp/cmake_modules/FindGTest.cmake +++ b/cpp/cmake_modules/FindGTest.cmake @@ -54,7 +54,7 @@ endif () if (GTEST_INCLUDE_DIR AND GTEST_LIBRARIES) set(GTEST_FOUND TRUE) - get_filename_component( GTEST_LIBS ${GTEST_LIBRARIES} DIRECTORY ) + get_filename_component( GTEST_LIBS ${GTEST_LIBRARIES} PATH ) set(GTEST_LIB_NAME libgtest) set(GTEST_STATIC_LIB ${GTEST_LIBS}/${GTEST_LIB_NAME}.a) set(GTEST_SHARED_LIB ${GTEST_LIBS}/${GTEST_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) http://git-wip-us.apache.org/repos/asf/arrow/blob/3a99f39d/cpp/cmake_modules/FindParquet.cmake ---------------------------------------------------------------------- diff --git a/cpp/cmake_modules/FindParquet.cmake b/cpp/cmake_modules/FindParquet.cmake index 76c2d1d..d16e6c9 100644 --- a/cpp/cmake_modules/FindParquet.cmake +++ b/cpp/cmake_modules/FindParquet.cmake @@ -43,7 +43,7 @@ endif () if (PARQUET_INCLUDE_DIR AND PARQUET_LIBRARIES) set(PARQUET_FOUND TRUE) - get_filename_component( PARQUET_LIBS ${PARQUET_LIBRARIES} DIRECTORY ) + get_filename_component( PARQUET_LIBS ${PARQUET_LIBRARIES} PATH ) set(PARQUET_LIB_NAME libparquet) set(PARQUET_STATIC_LIB ${PARQUET_LIBS}/${PARQUET_LIB_NAME}.a) set(PARQUET_SHARED_LIB ${PARQUET_LIBS}/${PARQUET_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
