feeble attempt to fix macosx CI

whoozle · Feb 28, 2024 · ff516db · ff516db
1 parent 19f9f8b
commit ff516db
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git 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 [email protected] cmake ninja libmagic
+        brew install qt@5 homebrew/cask/macfuse taglib [email protected] 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/[email protected] -DOPENSSL_LIBRARIES=/usr/local/opt/[email protected]/lib -DCMAKE_INSTALL_PREFIX=appdir -B build -G Ninja .
+      run: cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=`brew --prefix`/opt/qt -DOPENSSL_ROOT_DIR=/usr/local/opt/[email protected] -DOPENSSL_LIBRARIES=/usr/local/opt/[email protected]/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
@@ -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