From 71c2b05c31411561b3f0b8f4233703c6081a4485 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Wed, 28 Feb 2024 21:18:50 +0000 Subject: [PATCH] feeble attempt to fix macosx CI --- .github/workflows/actions.yml | 8 +++++--- qt/CMakeLists.txt | 16 ++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 5b422795..a890625e 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -28,7 +28,9 @@ jobs: removeArtifacts: true makeLatest: true - name: Install Dependencies... - run: sudo apt-get -y install qt5-default qttools5-dev qttools5-dev-tools libgtk2.0-dev libfuse-dev libmagic-dev libtag1-dev libssl-dev ninja-build cmake + run: | + sudo apt-get update + sudo apt-get -y install qt5-default qttools5-dev qttools5-dev-tools libgtk2.0-dev libfuse-dev libmagic-dev libtag1-dev libssl-dev ninja-build cmake - name: Checking out sources... uses: actions/checkout@v2 - name: Configuring... @@ -73,11 +75,11 @@ jobs: - name: Install Dependencies... run: | brew tap homebrew/cask - brew install qt5 homebrew/cask/macfuse taglib openssl@1.1 cmake ninja libmagic + brew install qt@5 homebrew/cask/macfuse taglib openssl@1.1 cmake ninja libmagic - name: Checking out sources... uses: actions/checkout@v2 - name: Configuring... - run: cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 -DOPENSSL_LIBRARIES=/usr/local/opt/openssl@1.1/lib -DCMAKE_INSTALL_PREFIX=appdir -B build -G Ninja . + run: cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="/usr/local/opt/qt@5/" -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 -DOPENSSL_LIBRARIES=/usr/local/opt/openssl@1.1/lib -DCMAKE_INSTALL_PREFIX=appdir -B build -G Ninja . - name: Building... run: ninja -j$(sysctl -n hw.ncpu) -C build - name: Installing... diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index d57e8ef0..120f8af1 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -1,16 +1,16 @@ if(DESIRED_QT_VERSION) if(DESIRED_QT_VERSION MATCHES 4) - find_package(Qt4 QUIET) + find_package(Qt4) else() - find_package(Qt5Widgets QUIET) - find_package(Qt5Network QUIET) - find_package(Qt5LinguistTools QUIET) + find_package(Qt5Widgets) + find_package(Qt5Network) + find_package(Qt5LinguistTools) endif() else() - find_package(Qt5Widgets QUIET) - find_package(Qt5Network QUIET) - find_package(Qt5LinguistTools QUIET) - find_package(Qt4 QUIET) + find_package(Qt5Widgets) + find_package(Qt5Network) + find_package(Qt5LinguistTools) + find_package(Qt4) endif() set(SOURCES main.cpp