fixing qt_dir in macos

Author: ponchio

.github/workflows/BuildRelight.yml

@@ -44,7 +44,8 @@ jobs:
       if: matrix.os == 'macos-14'
       run: |
         brew install opencv
-        echo "QT_VERSION=6.8.0" >> $GITHUB_ENV
+        echo "QT_VERSION=6.7.3" >> $GITHUB_ENV
+        echo "QT_DIR=/opt/homebrew/Cellar/qt/6.7.3" >> $GITHUB_ENV
 
     - name: Install OpenCV on Windows
       if: matrix.os == 'windows-latest'

build_scripts/macOS/1_build.sh

@@ -17,7 +17,6 @@ SOURCE_PATH=$SCRIPTS_PATH/../..
 BUILD_PATH=$SOURCE_PATH/build
 INSTALL_PATH=$SOURCE_PATH/install
 CORES="-j4"
-QT_DIR=""
 USE_BREW_LLVM=false
 CCACHE=""
 
@@ -37,10 +36,6 @@ 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,7 +3,6 @@
 SCRIPTS_PATH="$(dirname "$(realpath "$0")")"
 
 INSTALL_PATH=$SCRIPTS_PATH/../../install
-QT_DIR_OPTION=""
 PACKAGES_PATH=$SCRIPTS_PATH/../../packages
 SIGN=true
 NOTARIZE=true
@@ -20,10 +19,6 @@ 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
@@ -56,7 +51,7 @@ case $i in
 esac
 done
 
-bash $SCRIPTS_PATH/internal/2a_appbundle.sh -i=$INSTALL_PATH $QT_DIR_OPTION
+bash $SCRIPTS_PATH/internal/2a_appbundle.sh -i=$INSTALL_PATH
 
 echo "======= AppBundle Created ======="
 

build_scripts/macOS/internal/2a_appbundle.sh

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

relightlab/CMakeLists.txt

@@ -14,15 +14,16 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-set(OPENCV_RELIGHT_LIBS opencv_core  opencv_imgcodecs opencv_imgproc opencv_video)
-add_compile_definitions(WITH_OPENCV)
 
 if (APPLE)
 	set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum OS X deployment version" FORCE)
 	SET(CMAKE_INSTALL_RPATH $ORIGIN/../Frameworks)
 	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-#else()
-#	
+else()
+	#opencv deply fails on mac, qt is not in the path it seems.
+	#Cannot resolve rpath "@rpath/QtGui.framework/Versions/A/QtGui" ERROR: using QList("/opt/homebrew/Cellar/opencv/4.11.0/lib", "/Users/runner/work/relight/relight/install/lib")
+	set(OPENCV_RELIGHT_LIBS opencv_core  opencv_imgcodecs opencv_imgproc opencv_video)
+	add_compile_definitions(WITH_OPENCV)
 endif()