.

bavc · May 4, 2024 · f64e0d5 · f64e0d5
1 parent 5fda331
commit f64e0d5
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/.github/workflows/qctools.yml b/.github/workflows/qctools.yml
@@ -35,7 +35,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        brew install ${{ matrix.packages }} pkg-config ffmpeg qt@5
+        brew install ${{ matrix.packages }} pkg-config ffmpeg@6 qt@5
 
     - name: Install qwt-qt5
       run: |
@@ -53,6 +53,7 @@ jobs:
         cd Project/QtCreator
         mkdir build
         cd build
+        export PKG_CONFIG_PATH="/opt/homebrew/opt/ffmpeg@6/lib/pkgconfig"
         qmake ..
         make CC=$CC CXX=$CXX -j4
 
@@ -87,7 +88,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        brew install ${{ matrix.packages }} pkg-config ffmpeg qt
+        brew install ${{ matrix.packages }} pkg-config ffmpeg@6 qt
 
     - name: Install qwt
       run: |
@@ -104,6 +105,7 @@ jobs:
         cd Project/QtCreator
         mkdir build
         cd build
+        export PKG_CONFIG_PATH="/opt/homebrew/opt/ffmpeg@6/lib/pkgconfig"
         qmake ..
         make -j4
 
@@ -147,6 +149,10 @@ jobs:
         version: ${{ matrix.qt_version }}
         modules: ${{ matrix.qt_modules }}
 
+    - name: Set Qt5 environment path
+      run: |
+        echo "/usr/local/opt/qt5/bin" >> $GITHUB_PATH
+
     - name: Build qwt
       env:
         QT_VERSION: ${{ matrix.qt.version }}
@@ -223,6 +229,10 @@ jobs:
         version: ${{ matrix.qt_version }}
         modules: ${{ matrix.qt_modules }}
 
+    - name: Set Qt6 environment path
+      run: |
+        echo "/usr/local/opt/qt6/bin" >> $GITHUB_PATH
+
     - name: Build qwt
       run: |
         git clone --branch qwt-6.2 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt