Skip to content

Commit

Permalink
Update to handle newer Qt versions
Browse files Browse the repository at this point in the history
  • Loading branch information
kovzol committed Sep 27, 2023
1 parent 55c3be0 commit db2c284
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 12 deletions.
30 changes: 19 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,13 @@ Clone/Download the repository. For example:
```
git clone https://github.com/kovzol/aris
```
You may need to install additional software like `cmake`, Qt, `ninja`, and of course, you need to have
a working C/C++ compiler toolchain.

### gtk version

#### Linux or Mac

1. Follow the steps:
```
mkdir build
Expand Down Expand Up @@ -67,7 +71,17 @@ cmake ..

4. Launch using `./aris`.

For further instructions on building and installation ( without `cmake`), refer to the [INSTALL](INSTALL) file.
For further instructions on building and installation (without `cmake`), refer to the [INSTALL](INSTALL) file.

##### Windows (with MINGW)

Run the following inside `aris/`:
```
mkdir build
cd build
cmake -G "MinGW Makefiles" ..
mingw32-make -j4
```

#### Snap Installation

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

##### Linux
Run the following inside `aris/` :
Run the following inside `aris/`:
```
cmake -S qt/ -B build-qt/ -DCMAKE_GENERATOR:STRING=Ninja -DCMAKE_BUILD_TYPE:STRING=Release
cmake --build build-qt/ --target all
```
(In case Qt is installed in a non-system folder, add `-DCMAKE_PREFIX_PATH=...` to the first command line.
See https://stackoverflow.com/a/66457331 for more information.)

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:
```
cd build-qt/ && cmake -P cmake_install.cmake
Expand All @@ -91,15 +108,6 @@ To uninstall:
cd build-qt/ && xargs rm < install_manifest.txt
```

##### Windows (with MINGW)

Run the following inside `aris/`:
```
mkdir build
cd build
cmake -G "MinGW Makefiles" ..
mingw32-make -j4
```

#### Using `qmake`

Expand Down
3 changes: 2 additions & 1 deletion qt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_compile_definitions(WITH_CMAKE)

find_package(Qt6 6.2 REQUIRED COMPONENTS Quick Widgets QuickControls2)
find_package(Qt6 REQUIRED COMPONENTS Quick Widgets QuickControls2)
set(Qt6_FIND_VERSION_MIN 6.0)
find_package(LibXml2 REQUIRED)

add_executable(aris-qt
Expand Down

0 comments on commit db2c284

Please sign in to comment.