removing opencv for mac

Author: ponchio

.github/workflows/BuildRelight.yml

@@ -41,9 +41,9 @@ jobs:
         echo "QT_VERSION=6.6.*" >> $GITHUB_ENV
 
     - name: Install OpenCV on macOS
-      if: matrix.os == 'macos-14'
+      if: runner.os == 'macOS'
       run: |
-        echo "QT_VERSION=6.7.3" >> $GITHUB_ENV
+        echo "QT_VERSION=6.8.0" >> $GITHUB_ENV
 
     - name: Install OpenCV on Windows
       if: matrix.os == 'windows-latest'

build_scripts/macOS/1_build.sh

@@ -17,6 +17,7 @@ SOURCE_PATH=$SCRIPTS_PATH/../..
 BUILD_PATH=$SOURCE_PATH/build
 INSTALL_PATH=$SOURCE_PATH/install
 CORES="-j4"
+QT_DIR=""
 USE_BREW_LLVM=false
 CCACHE=""
 
@@ -36,6 +37,10 @@ case $i in
         CORES=$i
         shift # past argument=value
         ;;
+    -qt=*|--qt_dir=*)
+        QT_DIR=${i#*=}
+        shift # past argument=value
+        ;;
     --ccache)
         CCACHE="-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
         shift # past argument=value

build_scripts/macOS/2_deploy.sh

@@ -3,6 +3,7 @@
 SCRIPTS_PATH="$(dirname "$(realpath "$0")")"
 
 INSTALL_PATH=$SCRIPTS_PATH/../../install
+QT_DIR_OPTION=""
 PACKAGES_PATH=$SCRIPTS_PATH/../../packages
 SIGN=true
 NOTARIZE=true
@@ -19,6 +20,10 @@ case $i in
         INSTALL_PATH="${i#*=}"
         shift # past argument=value
         ;;
+    -qt=*|--qt_dir=*)
+        QT_DIR_OPTION=-qt=${i#*=}
+        shift # past argument=value
+        ;;
     -p=*|--packages_path=*)
         PACKAGES_PATH="${i#*=}"
         shift # past argument=value
@@ -51,7 +56,7 @@ case $i in
 esac
 done
 
-bash $SCRIPTS_PATH/internal/2a_appbundle.sh -i=$INSTALL_PATH
+bash $SCRIPTS_PATH/internal/2a_appbundle.sh -i=$INSTALL_PATH $QT_DIR_OPTION
 
 echo "======= AppBundle Created ======="
 

build_scripts/macOS/internal/2a_appbundle.sh

@@ -3,6 +3,7 @@
 SCRIPTS_PATH="$(dirname "$(realpath "$0")")"/..
 
 INSTALL_PATH=$SCRIPTS_PATH/../../install
+QT_DIR=""
 APPNAME="relightlab.app"
 
 #checking for parameters
@@ -13,6 +14,10 @@ case $i in
         INSTALL_PATH="${i#*=}"
         shift # past argument=value
         ;;
+    -qt=*|--qt_dir=*)
+        QT_DIR=${i#*=}/bin/
+        shift # past argument=value
+        ;;
     *)
         # unknown option
         ;;