Automatic merge branch 'main' into 'devel'

cnr-isti-vclab · Mar 18, 2024 · d32df15 · d32df15
2 parents 8e632f1 + a748adc
commit d32df15
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.github/actions/1_build/action.yml b/.github/actions/1_build/action.yml
@@ -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
diff --git a/.github/workflows/BuildMeshLab.yml b/.github/workflows/BuildMeshLab.yml
@@ -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

diff --git a/scripts/macOS/0_setup_env.sh b/scripts/macOS/0_setup_env.sh
@@ -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

diff --git a/scripts/macOS/1_build.sh b/scripts/macOS/1_build.sh
@@ -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