Skip to content

Commit

Permalink
Windows: fix compilation - newer conan
Browse files Browse the repository at this point in the history
We need a newer connan to support the latest clang on github actions.
New is always better.
  • Loading branch information
diegoiast committed Jun 14, 2024
1 parent f630415 commit aae1536
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
with:
python-version: '3.11'
- name: Install conan
run: pip3 install conan==1.61.0
run: pip3 install conan==1.64.1
- name: Install cmake-format
run: pip3 install cmake-format
- name: Setup MSVC (optional)
Expand Down
2 changes: 1 addition & 1 deletion docs/compile-linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ libraries - and python pip.

``` bash
apt install build-essential libx11-dev cmake ninja-build python3-pip clang-format
pip3 install conan==1.61
pip3 install conan==1.64.1
```

> *NOTE*
Expand Down
2 changes: 1 addition & 1 deletion docs/compile-windows-mingw.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ not only you get a useble GCC, but also Ninja and qgood IDE.
3. Python - I get the python from the Microsoft store, seems like the best idea.
4. Ninja - make sure `c:\Qt\Tools\Ninja\` is on your path, or copy the `ninja.exe` so
somewhere on your path.
5. Conan - from Windows Terminal write `pip install conan==1.61.0`
5. Conan - from Windows Terminal write `pip install conan==1.64.1`

Start QtCreator - and open the `CMakeLists.txt` for this project. It will probably
fail at the `cmake` step. This is because `cmake` cannot execute `conan`.
Expand Down
2 changes: 1 addition & 1 deletion docs/compile-windows-vs.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ I found the best way to work on git on Windows is to use [GitHub Desktop](https:
- UNpack the zip (a single `ninja.exe`) into `%HOMEDRIVE%%HOMEPATH%\ninja`
(usually `c:\user\diego\ninja`).
5. Conan
- from Windows Terminal write `pip install conan==1.61.0`
- from Windows Terminal write `pip install conan==1.64.1`
6. Setup environment variable `%PATH%` - to contain the needed path
- Visit <https://helpdeskgeek.com/windows-10/add-windows-path-environment-variable/>
to understand how to do this.
Expand Down

0 comments on commit aae1536

Please sign in to comment.