From aae15365d7140a85537af3cefe67ae38c59d2caa Mon Sep 17 00:00:00 2001 From: Diego Iastrubni Date: Fri, 14 Jun 2024 12:14:16 +0300 Subject: [PATCH] Windows: fix compilation - newer conan We need a newer connan to support the latest clang on github actions. New is always better. --- .github/workflows/build.yml | 2 +- docs/compile-linux.md | 2 +- docs/compile-windows-mingw.md | 2 +- docs/compile-windows-vs.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 838f236..3882f1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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) diff --git a/docs/compile-linux.md b/docs/compile-linux.md index 1c186f0..5726255 100644 --- a/docs/compile-linux.md +++ b/docs/compile-linux.md @@ -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* diff --git a/docs/compile-windows-mingw.md b/docs/compile-windows-mingw.md index cb99654..3f5d9d0 100644 --- a/docs/compile-windows-mingw.md +++ b/docs/compile-windows-mingw.md @@ -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`. diff --git a/docs/compile-windows-vs.md b/docs/compile-windows-vs.md index 1431b7d..0b524cb 100644 --- a/docs/compile-windows-vs.md +++ b/docs/compile-windows-vs.md @@ -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 to understand how to do this.