Skip to content

Commit

Permalink
feat: 默认安装好 conan
Browse files Browse the repository at this point in the history
  • Loading branch information
FeignClaims committed Oct 14, 2024
1 parent d656163 commit 94f9d07
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 16 deletions.
2 changes: 1 addition & 1 deletion download_and_install_linux/fedora/main.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
.. code-block:: bash
sudo dnf install llvm clang clang-tools-extra lldb cmake ninja-build git
sudo dnf install llvm clang clang-tools-extra lldb cmake ninja-build git conan ccache
.. note::

Expand Down
10 changes: 9 additions & 1 deletion download_and_install_linux/ubuntu_debian/main.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,15 @@

.. code-block:: bash
sudo apt install cmake git ninja-build libstdc++-12-dev
sudo apt install cmake git ninja-build libstdc++-12-dev pipx ccache
.. code-block:: bash
pipx ensurepath
.. code-block:: bash
pipx install conan
.. code-block:: bash
Expand Down
2 changes: 1 addition & 1 deletion download_and_install_macos/other_softwares.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

.. code-block:: bash
brew install llvm ninja git cmake dotnet@6
brew install llvm ninja git cmake conan ccache dotnet@6
.. code-block:: bash
Expand Down
4 changes: 4 additions & 0 deletions download_and_install_windows/msys2/environment/main.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@
样式一
在原 **变量值** 尾部加入英语输入法下的分号 ``;`` 后,加入 ``C:\msys64\clang64\bin`` (或 ``你在安装时自定义的 MSYS2 路径\clang64\bin``).

以同样方式加入 ``C:\msys64\usr\bin`` (或 ``你在安装时自定义的 MSYS2 路径\usr\bin``) 和 ``C:\msys64`` (或 ``你在安装时自定义的 MSYS2 路径``).

.. figure:: 环境变量样式一.png

环境变量样式一

样式二
点击 :menuselection:`新建(N)`, 再输入 ``C:\msys64\clang64\bin`` (或 ``你在安装时自定义的 MSYS2 路径\clang64\bin``).

以同样方式加入 ``C:\msys64\usr\bin`` (或 ``你在安装时自定义的 MSYS2 路径\usr\bin``) 和 ``C:\msys64`` (或 ``你在安装时自定义的 MSYS2 路径``).

.. figure:: 环境变量样式二.png

环境变量样式二
2 changes: 1 addition & 1 deletion download_and_install_windows/msys2/llvm/main.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

.. code-block:: bash
pacman -S mingw-w64-clang-x86_64-toolchain mingw-w64-clang-x86_64-cninja mingw-w64-clang-x86_64-python-six mingw-w64-clang-x86_64-python-pip
pacman -S mingw-w64-clang-x86_64-toolchain mingw-w64-clang-x86_64-cninja mingw-w64-clang-x86_64-python-six mingw-w64-clang-x86_64-python-pip mingw-w64-clang-x86_64-python-conan mingw-w64-clang-x86_64-ccache git
.. code-block:: bash
Expand Down
2 changes: 1 addition & 1 deletion how_to_update.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Linux

.. code-block:: bash
sudo apt update && sudo apt upgrade
sudo apt update && sudo apt upgrade && pipx upgrade-all --include-injected
.. code-block:: bash
Expand Down
2 changes: 1 addition & 1 deletion linuxbrew.irst
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@

.. code-block:: bash

brew install llvm cmake ninja git dotnet@6
brew install llvm cmake ninja git conan ccache dotnet@6
14 changes: 4 additions & 10 deletions third_party/conan/main.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
安装 conan
========================================================================================================================

2024 年 10 月 14 日后, 教程已经默认安装好 conan.

------------------------------------------------------------------------------------------------------------------------
Windows (MSYS2)
------------------------------------------------------------------------------------------------------------------------
Expand All @@ -26,23 +28,15 @@ Windows (MSYS2)

.. code-block:: bash
pacman -S python
.. code-block:: bash
pip3 install conan
pacman -S mingw-w64-python-conan
------------------------------------------------------------------------------------------------------------------------
MacOS
------------------------------------------------------------------------------------------------------------------------

.. code-block:: bash
brew install python
.. code-block:: bash
pip3 install conan
brew install conan
------------------------------------------------------------------------------------------------------------------------
Fedora
Expand Down

0 comments on commit 94f9d07

Please sign in to comment.