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-1013: Fix ZLIB_INCLUDE_DIR
Date Thu, 01 Jun 2017 22:30:20 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master fb787dda4 -> 8a40ef8d6


PARQUET-1013: Fix ZLIB_INCLUDE_DIR

Author: rip.nsk <rip.nsk@gmail.com>

Closes #347 from rip-nsk/PARQUET-1013 and squashes the following commits:

2aa8335 [rip.nsk] Fix ZLIB_INCLUDE_DIR


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

Branch: refs/heads/master
Commit: 8a40ef8d67dc6ce0110ec9bc32145e6b87c660a2
Parents: fb787dd
Author: rip.nsk <rip.nsk@gmail.com>
Authored: Thu Jun 1 18:30:15 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Thu Jun 1 18:30:15 2017 -0400

----------------------------------------------------------------------
 cmake_modules/ThirdpartyToolchain.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/8a40ef8d/cmake_modules/ThirdpartyToolchain.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 85922a7..80514df 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -133,7 +133,7 @@ endif()
 if (NOT ZLIB_FOUND)
   set(ZLIB_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/zlib_ep/src/zlib_ep-install")
   set(ZLIB_HOME "${ZLIB_PREFIX}")
-  set(ZLIB_INCLUDE_DIRS "${ZLIB_PREFIX}/include")
+  set(ZLIB_INCLUDE_DIR "${ZLIB_PREFIX}/include")
   if (MSVC)
     if (${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG")
       set(ZLIB_STATIC_LIB_NAME zlibstaticd.lib)
@@ -161,7 +161,7 @@ else()
   set(ZLIB_VENDORED 0)
 endif()
 
-include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
+include_directories(SYSTEM ${ZLIB_INCLUDE_DIR})
 add_library(zlibstatic STATIC IMPORTED)
 set_target_properties(zlibstatic PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB})
 
@@ -217,7 +217,7 @@ if (NOT THRIFT_FOUND)
 
     set(THRIFT_CMAKE_ARGS "-DFLEX_EXECUTABLE=${WINFLEXBISON_PREFIX}/win_flex.exe"
                           "-DBISON_EXECUTABLE=${WINFLEXBISON_PREFIX}/win_bison.exe"
-                          "-DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIRS}"
+                          "-DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIR}"
                           "-DZLIB_LIBRARY=${ZLIB_STATIC_LIB}"
                           "-DWITH_SHARED_LIB=OFF"
                           "-DWITH_PLUGIN=OFF"


Mime
View raw message