Skip to content

Commit a536f21

Browse files
authored
Merge pull request #164 from OpenMS/remove_unused_var
Remove unused var
2 parents e91abe7 + 8f72ac2 commit a536f21

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ jobs:
9494
$env:CMAKE_BUILD_PARALLEL_LEVEL = $NPROC
9595
New-Item -ItemType Directory -Force -Path "${{ github.workspace }}\contrib-build"
9696
Set-Location "${{ github.workspace }}\contrib-build"
97-
cmake ${{ matrix.CMAKE_ARGS }} -DBUILD_TYPE=ALL -DNUMBER_OF_JOBS=$NPROC "${{ github.workspace }}\contrib"
97+
cmake ${{ matrix.CMAKE_ARGS }} -DBUILD_TYPE=ALL "${{ github.workspace }}\contrib"
9898
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
9999
New-Item -ItemType Directory -Force -Path "${{ github.workspace }}\contrib-build-openmp"
100100
Set-Location "${{ github.workspace }}\contrib-build-openmp"
101-
cmake ${{ matrix.CMAKE_ARGS }} -DBUILD_TYPE=OPENMP -DNUMBER_OF_JOBS=$NPROC "${{ github.workspace }}\contrib"
101+
cmake ${{ matrix.CMAKE_ARGS }} -DBUILD_TYPE=OPENMP "${{ github.workspace }}\contrib"
102102
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
103103
104104
- name: Build contrib (Unix)
@@ -113,10 +113,10 @@ jobs:
113113
export CMAKE_BUILD_PARALLEL_LEVEL=${NPROC:-4}
114114
mkdir -p "$GITHUB_WORKSPACE/contrib-build"
115115
cd "$GITHUB_WORKSPACE/contrib-build"
116-
cmake ${{ matrix.CMAKE_ARGS }} -DBUILD_TYPE=ALL -DNUMBER_OF_JOBS=$CMAKE_BUILD_PARALLEL_LEVEL "$GITHUB_WORKSPACE/contrib"
116+
cmake ${{ matrix.CMAKE_ARGS }} -DBUILD_TYPE=ALL "$GITHUB_WORKSPACE/contrib"
117117
mkdir -p "$GITHUB_WORKSPACE/contrib-build-openmp"
118118
cd "$GITHUB_WORKSPACE/contrib-build-openmp"
119-
cmake ${{ matrix.CMAKE_ARGS }} -DBUILD_TYPE=OPENMP -DNUMBER_OF_JOBS=$CMAKE_BUILD_PARALLEL_LEVEL "$GITHUB_WORKSPACE/contrib"
119+
cmake ${{ matrix.CMAKE_ARGS }} -DBUILD_TYPE=OPENMP "$GITHUB_WORKSPACE/contrib"
120120
121121
- name: Configure Git for Tagging
122122
if: github.event_name == 'workflow_dispatch'

libraries.cmake/arrow.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ else() ## Linux/MacOS
116116
"-DBOOST_ROOT=${PROJECT_BINARY_DIR}"
117117
"-DBoost_DIR=${PROJECT_BINARY_DIR}"
118118
"-DARROW_CSV=ON"
119+
"-DCMAKE_INSTALL_LIBDIR=${PROJECT_BINARY_DIR}/lib"
119120
"-DARROW_PARQUET=ON"
120121
"-DARROW_WITH_ZLIB=ON"
121122
"-DARROW_WITH_BZIP2=ON"

0 commit comments

Comments
 (0)