Skip to content

Commit db2c284

Browse files
committed
Update to handle newer Qt versions
1 parent 55c3be0 commit db2c284

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

README.md

+19-11
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,13 @@ Clone/Download the repository. For example:
2929
```
3030
git clone https://github.com/kovzol/aris
3131
```
32+
You may need to install additional software like `cmake`, Qt, `ninja`, and of course, you need to have
33+
a working C/C++ compiler toolchain.
3234

3335
### gtk version
3436

37+
#### Linux or Mac
38+
3539
1. Follow the steps:
3640
```
3741
mkdir build
@@ -67,7 +71,17 @@ cmake ..
6771

6872
4. Launch using `./aris`.
6973

70-
For further instructions on building and installation ( without `cmake`), refer to the [INSTALL](INSTALL) file.
74+
For further instructions on building and installation (without `cmake`), refer to the [INSTALL](INSTALL) file.
75+
76+
##### Windows (with MINGW)
77+
78+
Run the following inside `aris/`:
79+
```
80+
mkdir build
81+
cd build
82+
cmake -G "MinGW Makefiles" ..
83+
mingw32-make -j4
84+
```
7185

7286
#### Snap Installation
7387

@@ -77,11 +91,14 @@ To install GNU Aris through snap, visit https://snapcraft.io/aris and find the r
7791
#### Using `cmake`
7892

7993
##### Linux
80-
Run the following inside `aris/` :
94+
Run the following inside `aris/`:
8195
```
8296
cmake -S qt/ -B build-qt/ -DCMAKE_GENERATOR:STRING=Ninja -DCMAKE_BUILD_TYPE:STRING=Release
8397
cmake --build build-qt/ --target all
8498
```
99+
(In case Qt is installed in a non-system folder, add `-DCMAKE_PREFIX_PATH=...` to the first command line.
100+
See https://stackoverflow.com/a/66457331 for more information.)
101+
85102
This should generate a binary `aris-qt` inside `build-qt/` , it can be run with `./aris-qt` or you can install to `/usr/local` with:
86103
```
87104
cd build-qt/ && cmake -P cmake_install.cmake
@@ -91,15 +108,6 @@ To uninstall:
91108
cd build-qt/ && xargs rm < install_manifest.txt
92109
```
93110

94-
##### Windows (with MINGW)
95-
96-
Run the following inside `aris/`:
97-
```
98-
mkdir build
99-
cd build
100-
cmake -G "MinGW Makefiles" ..
101-
mingw32-make -j4
102-
```
103111

104112
#### Using `qmake`
105113

qt/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ set(CMAKE_AUTOMOC ON)
66
set(CMAKE_CXX_STANDARD_REQUIRED ON)
77
add_compile_definitions(WITH_CMAKE)
88

9-
find_package(Qt6 6.2 REQUIRED COMPONENTS Quick Widgets QuickControls2)
9+
find_package(Qt6 REQUIRED COMPONENTS Quick Widgets QuickControls2)
10+
set(Qt6_FIND_VERSION_MIN 6.0)
1011
find_package(LibXml2 REQUIRED)
1112

1213
add_executable(aris-qt

0 commit comments

Comments
 (0)