parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject parquet-cpp git commit: PARQUET-565: Use PATH instead of DIRECTORY in get_filename_component
Date Wed, 16 Mar 2016 16:36:43 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master 225fba78b -> 1ebf7a1b8


PARQUET-565: Use PATH instead of DIRECTORY in get_filename_component

Fixes support for CMake<=2.8.11

Author: Korn, Uwe <Uwe.Korn@blue-yonder.com>

Closes #80 from xhochy/cmake-path-for-old-versions and squashes the following commits:

f228d07 [Korn, Uwe] PARQUET-565: Use PATH instead of DIRECTORY in get_filename_component


Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/1ebf7a1b
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/1ebf7a1b
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/1ebf7a1b

Branch: refs/heads/master
Commit: 1ebf7a1b80dd08ac3dd369d1bc2de29b0096775e
Parents: 225fba7
Author: Korn, Uwe <Uwe.Korn@blue-yonder.com>
Authored: Wed Mar 16 09:36:57 2016 -0700
Committer: Wes McKinney <wesm@apache.org>
Committed: Wed Mar 16 09:36:57 2016 -0700

----------------------------------------------------------------------
 cmake_modules/FindGTest.cmake  | 2 +-
 cmake_modules/FindLz4.cmake    | 2 +-
 cmake_modules/FindSnappy.cmake | 2 +-
 cmake_modules/FindZLIB.cmake   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/1ebf7a1b/cmake_modules/FindGTest.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/FindGTest.cmake b/cmake_modules/FindGTest.cmake
index e47faf0..3c5d2b6 100644
--- a/cmake_modules/FindGTest.cmake
+++ b/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/parquet-cpp/blob/1ebf7a1b/cmake_modules/FindLz4.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake
index 1f6ba47..0184f2b 100644
--- a/cmake_modules/FindLz4.cmake
+++ b/cmake_modules/FindLz4.cmake
@@ -55,7 +55,7 @@ endif ()
 
 if (LZ4_INCLUDE_DIR AND LZ4_LIBRARIES)
   set(LZ4_FOUND TRUE)
-  get_filename_component( LZ4_LIBS ${LZ4_LIBRARIES} DIRECTORY )
+  get_filename_component( LZ4_LIBS ${LZ4_LIBRARIES} PATH )
   set(LZ4_LIB_NAME liblz4)
   set(LZ4_STATIC_LIB ${LZ4_LIBS}/${LZ4_LIB_NAME}.a)
   set(LZ4_SHARED_LIB ${LZ4_LIBS}/${LZ4_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/1ebf7a1b/cmake_modules/FindSnappy.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake
index 08e8d73..32c9387 100644
--- a/cmake_modules/FindSnappy.cmake
+++ b/cmake_modules/FindSnappy.cmake
@@ -54,7 +54,7 @@ endif ()
 
 if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
   set(SNAPPY_FOUND TRUE)
-  get_filename_component( SNAPPY_LIBS ${SNAPPY_LIBRARIES} DIRECTORY )
+  get_filename_component( SNAPPY_LIBS ${SNAPPY_LIBRARIES} PATH )
   set(SNAPPY_LIB_NAME libsnappy)
   set(SNAPPY_STATIC_LIB ${SNAPPY_LIBS}/${SNAPPY_LIB_NAME}.a)
   set(SNAPPY_SHARED_LIB ${SNAPPY_LIBS}/${SNAPPY_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/1ebf7a1b/cmake_modules/FindZLIB.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/FindZLIB.cmake b/cmake_modules/FindZLIB.cmake
index 0d7f2ae..b0c11db 100644
--- a/cmake_modules/FindZLIB.cmake
+++ b/cmake_modules/FindZLIB.cmake
@@ -55,7 +55,7 @@ endif ()
 
 if (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARIES)
   set(ZLIB_FOUND TRUE)
-  get_filename_component( ZLIB_LIBS ${ZLIB_LIBRARIES} DIRECTORY )
+  get_filename_component( ZLIB_LIBS ${ZLIB_LIBRARIES} PATH )
   set(ZLIB_LIB_NAME libz)
   set(ZLIB_STATIC_LIB ${ZLIB_LIBS}/${ZLIB_LIB_NAME}.a)
   set(ZLIB_SHARED_LIB ${ZLIB_LIBS}/${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})


Mime
View raw message