Skip to content

Commit

Permalink
ARROW-2321: [C++] Release verification script fails with if CMAKE_INS…
Browse files Browse the repository at this point in the history
…TALL_LIBDIR is not $ARROW_HOME/lib

Author: Phillip Cloud <[email protected]>

Closes apache#1762 from cpcloud/ARROW-2321 and squashes the following commits:

e1bf3831 <Phillip Cloud> ARROW-2321:  Release verification script fails with if CMAKE_INSTALL_LIBDIR is not $ARROW_HOME/lib
  • Loading branch information
cpcloud authored and wesm committed Mar 16, 2018
1 parent b0f3e11 commit 5e8b7b8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion dev/release/verify-release-candidate.bat
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
@rem cmake ^
@rem git ^
@rem boost-cpp ^
@rem snappy zlib brotli gflags lz4-c zstd || exit /B
@rem snappy zlib brotli gflags lz4-c zstd -c conda-forge || exit /B

@rem Then run from the directory containing the RC tarball
@rem
Expand Down
4 changes: 3 additions & 1 deletion dev/release/verify-release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ setup_miniconda() {
numpy \
pandas \
six \
cython=0.27.3
cython=0.27.3 -c conda-forge
source activate arrow-test
}

Expand All @@ -115,6 +115,7 @@ test_and_install_cpp() {
pushd cpp/build

cmake -DCMAKE_INSTALL_PREFIX=$ARROW_HOME \
-DCMAKE_INSTALL_LIBDIR=$ARROW_HOME/lib \
-DARROW_PLASMA=on \
-DARROW_PYTHON=on \
-DARROW_BOOST_USE_SHARED=on \
Expand All @@ -138,6 +139,7 @@ install_parquet_cpp() {
pushd parquet-cpp/build

cmake -DCMAKE_INSTALL_PREFIX=$PARQUET_HOME \
-DCMAKE_INSTALL_LIBDIR=$PARQUET_HOME/lib \
-DCMAKE_BUILD_TYPE=release \
-DPARQUET_BOOST_USE_SHARED=on \
-DPARQUET_BUILD_TESTS=off \
Expand Down

0 comments on commit 5e8b7b8

Please sign in to comment.