use apple clang instead of brew llvm

This commit is contained in:
Alessandro Muntoni 2024-03-18 14:26:45 +01:00
parent a659bd5be3
commit a748adc740
4 changed files with 14 additions and 4 deletions

View File

@ -57,4 +57,4 @@ runs:
- name: Configure and Build
shell: bash
run: |
bash scripts/${{ runner.os }}/1_build.sh ${{ steps.envs.outputs.build_option }} ${{ inputs.build-options }} ${{ steps.envs.outputs.nightly }} --use_brew_llvm --ccache
bash scripts/${{ runner.os }}/1_build.sh ${{ steps.envs.outputs.build_option }} ${{ inputs.build-options }} ${{ steps.envs.outputs.nightly }} --ccache

View File

@ -47,7 +47,7 @@ jobs:
with:
cache-path: src/external/downloads/*
cache-key: external-libraries
build-precision: ${{matrix.precision}}
build-precision: ${{matrix.precision}}
build-options: ${{steps.envs.outputs.build_options}}
nightly: true
- name: Deploy

View File

@ -22,7 +22,7 @@ case $i in
esac
done
brew install coreutils node cmake ninja llvm libomp cgal xerces-c tbb embree
brew install coreutils node cmake ninja libomp cgal xerces-c tbb embree
npm install -g appdmg
if [ "$DONT_INSTALL_QT" = false ] ; then

View File

@ -91,9 +91,19 @@ fi
BUILD_PATH=$(realpath $BUILD_PATH)
INSTALL_PATH=$(realpath $INSTALL_PATH)
OPENMP_PATH=$(brew --prefix libomp)
cd $BUILD_PATH
export NINJA_STATUS="[%p (%f/%t) ] "
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH $CCACHE $DOUBLE_PRECISION_OPTION $NIGHTLY_OPTION $SOURCE_PATH
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DOpenMP_ROOT=$OPENMP_PATH \
-DCMAKE_INSTALL_PREFIX=$INSTALL_PATH \
$CCACHE \
$DOUBLE_PRECISION_OPTION \
$NIGHTLY_OPTION \
$SOURCE_PATH
ninja
ninja install