Skip to content

Commit 920453b

Browse files
authored
macOS: use conda in stead of mamba to install deps (#5626)
For some reason installing the conda packages with mamba fails, replacing with the use of conda executive in stead solves this. In addition, enable libLAS to build with CMake version 4+.
1 parent 9528b1e commit 920453b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

macos/build_grass_app.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ conda_stable_file="${this_script_dir}/files/conda-requirements-stable-${arch}.tx
3737
conda_dev_file="${this_script_dir}/files/conda-requirements-dev-${arch}.txt"
3838
conda_req_file="$conda_stable_file"
3939
conda_temp_dir=$(mktemp -d -t GRASS)
40-
conda_bin="${conda_temp_dir}/bin/mamba"
40+
conda_bin="${conda_temp_dir}/bin/conda"
4141
conda_update_stable=0
4242
miniconda_url="https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-${arch}.sh"
4343
dmg_title=

macos/files/liblas-install.sh

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ LIBLAS_CONFIGURE_FLAGS="
9696
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
9797
-DCMAKE_MACOSX_RPATH=ON \
9898
-DCMAKE_INSTALL_RPATH=${PREFIX} \
99+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
99100
-DWITH_GEOTIFF=ON \
100101
-DGEOTIFF_INCLUDE_DIR=${PREFIX}/include \
101102
-DGEOTIFF_LIBRARY=${PREFIX}/lib/libgeotiff.dylib \

0 commit comments

Comments
 (0)