Skip to content

Commit

Permalink
Build with Qt6
Browse files Browse the repository at this point in the history
  • Loading branch information
z3ntu committed Mar 9, 2024
1 parent 01abc1d commit c77c083
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 15 deletions.
6 changes: 2 additions & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ os: Visual Studio 2022

environment:
matrix:
- arch: x86
compiler: msvc2019
- arch: x64
compiler: msvc2019

Expand All @@ -12,8 +10,8 @@ platform:

install:
# Set paths to dependencies (based on architecture)
- cmd: if %arch%==x86 (set PYTHON_ROOT=C:\python312) else (set PYTHON_ROOT=C:\python312-x64)
- cmd: if %arch%==x86 (set QT_ROOT=C:\Qt\5.15\%compiler%) else (set QT_ROOT=C:\Qt\5.15\%compiler%_64)
- cmd: set PYTHON_ROOT=C:\python312-x64
- cmd: set QT_ROOT=C:\Qt\6.5\%compiler%_64
# Print out dependency paths
- cmd: echo Using Python at %PYTHON_ROOT%
- cmd: echo Using Qt at %QT_ROOT%
Expand Down
4 changes: 2 additions & 2 deletions .builds/alpine.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
image: alpine/edge
packages:
- meson
- qt5-qtbase-dev
- qt5-qttools-dev
- qt6-qtbase-dev
- qt6-qttools-dev
sources:
- https://github.com/z3ntu/libopenrazer
tasks:
Expand Down
8 changes: 4 additions & 4 deletions .builds/freebsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ image: freebsd/latest
packages:
- meson
- pkgconf
- qt5-buildtools
- qt5-dbus
- qt5-widgets
- qt5-xml
- qt6-buildtools
- qt6-dbus
- qt6-widgets
- qt6-xml
sources:
- https://github.com/z3ntu/libopenrazer
tasks:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: '3.x'
- run: brew install qt@5 meson
- run: echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH
- run: brew install qt@6 meson
- run: echo "/usr/local/opt/qt@6/bin" >> $GITHUB_PATH
- run: meson setup builddir
- run: meson compile -C builddir
6 changes: 3 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
project('libopenrazer',
'cpp',
version : '0.2.0',
default_options : ['cpp_std=c++11'])
default_options : ['cpp_std=c++17'])

qt = import('qt5')
qt_dep = dependency('qt5', modules : ['Core', 'DBus', 'Gui', 'Xml'])
qt = import('qt6')
qt_dep = dependency('qt6', modules : ['Core', 'DBus', 'Gui', 'Xml'])

sources = [
'src/dbusexception.cpp',
Expand Down

0 comments on commit c77c083

Please sign in to comment.