diff --git a/README.md b/README.md index 00c34ff..2fb594d 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 @@ -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 @@ -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` diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 1630eec..a23b830 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -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