From db0914462438141f0c306966049e0ca6c337b87e Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 2 Mar 2021 21:52:00 +0100 Subject: [PATCH] Switch macOS builds to Qt 6 --- .github/workflows/ccpp.yml | 34 ++++++++++++++++++++-------------- .travis.yml | 6 +++--- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 0f65e6e4..efca1b49 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -1023,6 +1023,10 @@ jobs: runs-on: macos-10.15 steps: - uses: actions/checkout@v1.2.0 + - name: Update packages + run: brew update + - name: Upgrade packages + run: brew upgrade - name: Install packages run: > brew install @@ -1058,24 +1062,23 @@ jobs: sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework /Library/Frameworks/Sparkle.framework sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework.dSYM /Library/Frameworks/Sparkle.framework.dSYM - - name: Delete conflicting taglib system headers - shell: bash - run: rm -rf /usr/local/include/taglib - - name: Create Build Environment shell: bash run: cmake -E make_directory build - name: Configure CMake shell: bash env: + BUILD_TYPE: Release PKG_CONFIG_PATH: /usr/local/lib/pkgconfig - Qt5_DIR: /usr/local/opt/qt5/lib/cmake - Qt5LinguistTools_DIR: /usr/local/opt/qt5/lib/cmake/Qt5LinguistTools + Qt6_DIR: /usr/local/opt/qt6/lib/cmake + Qt5LinguistTools_DIR: /usr/local/opt/qt6/lib/cmake/Qt6LinguistTools GST_SCANNER_PATH: /usr/local/opt/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner GST_PLUGIN_PATH: /usr/local/lib/gstreamer-1.0 working-directory: build - run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON -DUSE_BUNDLE=ON + run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WITH_QT6=ON -DBUILD_WERROR=ON -DUSE_BUNDLE=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt6/lib/cmake - name: Build + env: + BUILD_TYPE: Release working-directory: build shell: bash run: cmake --build . --config $BUILD_TYPE @@ -1097,6 +1100,10 @@ jobs: runs-on: macos-11.0 steps: - uses: actions/checkout@v1.2.0 + - name: Update packages + run: brew update + - name: Upgrade packages + run: brew upgrade - name: Install packages run: > brew install @@ -1132,24 +1139,23 @@ jobs: sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework /Library/Frameworks/Sparkle.framework sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework.dSYM /Library/Frameworks/Sparkle.framework.dSYM - - name: Delete conflicting taglib system headers - shell: bash - run: rm -rf /usr/local/include/taglib - - name: Create Build Environment shell: bash run: cmake -E make_directory build - name: Configure CMake shell: bash env: + BUILD_TYPE: Release PKG_CONFIG_PATH: /usr/local/lib/pkgconfig - Qt5_DIR: /usr/local/opt/qt5/lib/cmake - Qt5LinguistTools_DIR: /usr/local/opt/qt5/lib/cmake/Qt5LinguistTools + Qt5_DIR: /usr/local/opt/qt6/lib/cmake + Qt5LinguistTools_DIR: /usr/local/opt/qt6/lib/cmake/Qt6LinguistTools GST_SCANNER_PATH: /usr/local/opt/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner GST_PLUGIN_PATH: /usr/local/lib/gstreamer-1.0 working-directory: build - run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON -DUSE_BUNDLE=ON + run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WITH_QT6=ON -DBUILD_WERROR=ON -DUSE_BUNDLE=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt6/lib/cmake - name: Build + env: + BUILD_TYPE: Release working-directory: build shell: bash run: cmake --build . --config $BUILD_TYPE diff --git a/.travis.yml b/.travis.yml index 1c4fb916..7490056c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,13 +21,13 @@ before_install: - brew install --cask sparkle - sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework /Library/Frameworks/Sparkle.framework - sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework.dSYM /Library/Frameworks/Sparkle.framework.dSYM - - export Qt5_DIR=/usr/local/opt/qt5/lib/cmake - - export Qt5LinguistTools_DIR=/usr/local/opt/qt5/lib/cmake/Qt5LinguistTools + - export Qt6_DIR=/usr/local/opt/qt6/lib/cmake + - export Qt6LinguistTools_DIR=/usr/local/opt/qt6/lib/cmake/Qt6LinguistTools - ls /usr/local/lib/gstreamer-1.0 before_script: - mkdir build - cd build - - cmake .. -DBUILD_WERROR=ON -DUSE_BUNDLE=ON + - cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_QT6=ON -DBUILD_WERROR=ON -DUSE_BUNDLE=ON script: - make -j8 - make install