mirror of
https://github.com/lucaspalomodevelop/meshlab.git
synced 2026-03-13 00:07:24 +00:00
use apple clang instead of brew llvm
This commit is contained in:
parent
a659bd5be3
commit
a748adc740
2
.github/actions/1_build/action.yml
vendored
2
.github/actions/1_build/action.yml
vendored
@ -57,4 +57,4 @@ runs:
|
|||||||
- name: Configure and Build
|
- name: Configure and Build
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
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
|
||||||
2
.github/workflows/BuildMeshLab.yml
vendored
2
.github/workflows/BuildMeshLab.yml
vendored
@ -47,7 +47,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
cache-path: src/external/downloads/*
|
cache-path: src/external/downloads/*
|
||||||
cache-key: external-libraries
|
cache-key: external-libraries
|
||||||
build-precision: ${{matrix.precision}}
|
build-precision: ${{matrix.precision}}
|
||||||
build-options: ${{steps.envs.outputs.build_options}}
|
build-options: ${{steps.envs.outputs.build_options}}
|
||||||
nightly: true
|
nightly: true
|
||||||
- name: Deploy
|
- name: Deploy
|
||||||
|
|||||||
@ -22,7 +22,7 @@ case $i in
|
|||||||
esac
|
esac
|
||||||
done
|
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
|
npm install -g appdmg
|
||||||
|
|
||||||
if [ "$DONT_INSTALL_QT" = false ] ; then
|
if [ "$DONT_INSTALL_QT" = false ] ; then
|
||||||
|
|||||||
@ -91,9 +91,19 @@ fi
|
|||||||
|
|
||||||
BUILD_PATH=$(realpath $BUILD_PATH)
|
BUILD_PATH=$(realpath $BUILD_PATH)
|
||||||
INSTALL_PATH=$(realpath $INSTALL_PATH)
|
INSTALL_PATH=$(realpath $INSTALL_PATH)
|
||||||
|
OPENMP_PATH=$(brew --prefix libomp)
|
||||||
|
|
||||||
cd $BUILD_PATH
|
cd $BUILD_PATH
|
||||||
export NINJA_STATUS="[%p (%f/%t) ] "
|
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
|
||||||
ninja install
|
ninja install
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user