Merge pull request COVESA#482 from bunty95/master

@rpath/libqdlt.dylib fix for MacOS

.github/workflows/Release.yml

@@ -149,4 +149,4 @@ jobs:
  files: |
  DLT-*
  env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

scripts/darwin/build.sh

@@ -28,9 +28,10 @@ echo Build with CMake
 cmake -G Ninja \
  -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
  -DCMAKE_PREFIX_PATH=/opt/qt512/lib/cmake \
+ -DCMAKE_OSX_DEPLOYMENT_TARGET=12.7 \
  -DCMAKE_BUILD_TYPE=Release \
  -DDLT_USE_QT_RPATH=ON \
- -DDLT_PARSER=OFF \
+ -DDLT_PARSER=ON \
  -DDLT_APP_DIR_NAME=${APP_DIR_NAME} \
  -DDLT_LIBRARY_INSTALLATION_PATH="${APP_DIR_NAME}/Contents/Frameworks" \
  -DDLT_EXECUTABLE_INSTALLATION_PATH="${APP_DIR_NAME}/Contents/MacOS" \

scripts/darwin/install.sh

@@ -5,7 +5,8 @@ id
 env
 pwd
 
-brew install --ignore-dependencies qt@5
+brew update
+brew install qt@5
 brew link qt@5 --force --overwrite
 # https://github.com/Homebrew/homebrew-core/issues/8392
 # https://github.com/Homebrew/legacy-homebrew/issues/29938

src/CMakeLists.txt

@@ -69,7 +69,7 @@ endif()
 
 set_target_properties(dlt-viewer PROPERTIES
  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
- INSTALL_RPATH "$ORIGIN/../lib;$<$<BOOL:${DLT_USE_QT_RPATH}>:${DLT_QT_LIB_DIR}>")
+ INSTALL_RPATH "$<$<BOOL:${LINUX}>:$ORIGIN/../lib;>$<$<BOOL:${APPLE}>:@loader_path/../Frameworks;>$<$<BOOL:${DLT_USE_QT_RPATH}>:${DLT_QT_LIB_DIR}>")
 
  install(TARGETS dlt-viewer
  DESTINATION "${DLT_EXECUTABLE_INSTALLATION_PATH}"