Skip to content

Commit

Permalink
适配对 project_options 相关文件的命名更新
Browse files Browse the repository at this point in the history
  • Loading branch information
FeignClaims committed May 11, 2024
1 parent 2d17a48 commit 6706848
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions third_party/conan/main.rst
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Ubuntu/Debian
在 cpp_novice 中启用 conan
========================================================================================================================

在 ``cpp_novice`` 文件夹根目录中找到 ``CMakeLists.txt``, 在 ``include(fetch_project_options)``, ``project(...)`` 之前添加一行 ``run_conan()``.
在 ``cpp_novice`` 文件夹根目录中找到 ``CMakeLists.txt``, 在 ``include(cpp_novice_fetch_project_options)``, ``project(...)`` 之前添加一行 ``run_conan()``.

.. code-block:: cmake
:emphasize-lines: 5
Expand All @@ -81,7 +81,7 @@ Ubuntu/Debian
cmake_minimum_required(VERSION 3.25)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(fetch_project_options)
include(cpp_novice_fetch_project_options)
run_conan()
project(cpp_novice LANGUAGES CXX)
Expand Down
4 changes: 2 additions & 2 deletions third_party/vcpkg/main.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
在 cpp_novice 中启用 vcpkg
========================================================================================================================

在 ``cpp_novice`` 文件夹根目录中找到 ``CMakeLists.txt``, 在 ``include(fetch_project_options)``, ``project(...)`` 之前添加一行 ``run_vcpkg()``.
在 ``cpp_novice`` 文件夹根目录中找到 ``CMakeLists.txt``, 在 ``include(cpp_novice_fetch_project_options)``, ``project(...)`` 之前添加一行 ``run_vcpkg()``.

.. code-block:: cmake
:emphasize-lines: 5
Expand All @@ -25,7 +25,7 @@
cmake_minimum_required(VERSION 3.25)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(fetch_project_options)
include(cpp_novice_fetch_project_options)
run_vcpkg()
project(cpp_novice LANGUAGES CXX)
Expand Down

0 comments on commit 6706848

Please sign in to comment.