From 25a65ed428049df77fa1e0aba46acbc6069a28be Mon Sep 17 00:00:00 2001 From: Thom Troy Date: Sat, 6 Apr 2019 22:29:57 +0100 Subject: [PATCH] fix some typos --- .../A-using-system-provide-packages/README.adoc | 2 +- 07-package-management/B-vendoring-code/README.adoc | 6 +++--- 07-package-management/C-external-project-add/README.adoc | 6 +++--- 07-package-management/D-conan/README.adoc | 4 ++-- 07-package-management/D-conan/basic/README.adoc | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/07-package-management/A-using-system-provide-packages/README.adoc b/07-package-management/A-using-system-provide-packages/README.adoc index 4fcc35a..edee481 100644 --- a/07-package-management/A-using-system-provide-packages/README.adoc +++ b/07-package-management/A-using-system-provide-packages/README.adoc @@ -10,4 +10,4 @@ Using your system provided packages is one of the oldest and most common form of # Examples -I have already show how to do this in the link:https://github.com/ttroy50/cmake-examples/tree/master/01-basic/H-third-party-library[third party libray] example from the basic section and the link:https://github.com/ttroy50/cmake-examples/tree/master/05-unit-testing/boost[boost unit test] example. +I have already shown how to do this in the link:https://github.com/ttroy50/cmake-examples/tree/master/01-basic/H-third-party-library[third party library] example from the basic section and the link:https://github.com/ttroy50/cmake-examples/tree/master/05-unit-testing/boost[boost unit test] example. diff --git a/07-package-management/B-vendoring-code/README.adoc b/07-package-management/B-vendoring-code/README.adoc index 59cf7de..fc2024e 100644 --- a/07-package-management/B-vendoring-code/README.adoc +++ b/07-package-management/B-vendoring-code/README.adoc @@ -6,7 +6,7 @@ toc::[] # Introduction -Vendoring code means to include the third party code inside your repository and building it as part of your project. It is a way to insure that all files required to build your project are part of the development environment. +Vendoring code means to include the third party code inside your repository and build it as part of your project. It is a way to ensure that all files required to build your project are part of the development environment. # Implementation @@ -34,9 +34,9 @@ If the third party code doesn't support CMake, you may need to create a "shim" l ## Using git to vendor code -An slightly different method to maintain the third party code can be to use your SCM software to manage the process for you. +A slightly different method to include the third party code can be to use your SCM software to manage the process for you. -In the case of git, you can use link:https://git-scm.com/book/en/v2/Git-Tools-Submodules[git sub-modules] or link:https://git-scm.com/book/en/v1/Git-Tools-Subtree-Merging[git subtree] to pull the correct version of the third party code into your repository on initialisation / update. +In the case of git, you can use link:https://git-scm.com/book/en/v2/Git-Tools-Submodules[git sub-modules] or link:https://git-scm.com/book/en/v1/Git-Tools-Subtree-Merging[git subtree]. These can pull the correct version of the third party code into your repository on initialisation / update. # Examples diff --git a/07-package-management/C-external-project-add/README.adoc b/07-package-management/C-external-project-add/README.adoc index 691dce6..250f9d7 100644 --- a/07-package-management/C-external-project-add/README.adoc +++ b/07-package-management/C-external-project-add/README.adoc @@ -14,13 +14,13 @@ Once configured an external project will generate a custom target which can be u ## Standard -A standard example of an external project is as follows: +A simple example of an external project is as follows: [source,cmake] ---- include(ExternalProject) ExternalProject_Add(googletest - URL https://github.com/google/googletest/archive/bfc0ffc8a698072c794ae7299db9cb6866f4c0bc.tar.gz_ + URL https://github.com/google/googletest/archive/bfc0ffc8a698072c794ae7299db9cb6866f4c0bc.tar.gz_ ) ---- @@ -35,6 +35,6 @@ By default the project is assumed to work via CMake and external project will kn ## Alternative -An alternative method to install packages is to have the ExternalProject command run at CMake configure time. This can cause the download to happen at teh configure step and you may then use +add_subdirectory+ to add the project to your code (assuming it uses CMake). An example of this can be found in the link:https://github.com/ttroy50/cmake-examples/tree/master/05-unit-testing/google-test-download[google-test-download] tutorial. +An alternative method to install packages is to have the ExternalProject command run at CMake configure time. This can cause the download to happen at the configure step and you may then use +add_subdirectory+ to add the project to your code (assuming it uses CMake). An example of this can be found in the link:https://github.com/ttroy50/cmake-examples/tree/master/05-unit-testing/google-test-download[google-test-download] tutorial. A more generic version of the download code can be found link:https://github.com/Crascit/DownloadProject[here]. \ No newline at end of file diff --git a/07-package-management/D-conan/README.adoc b/07-package-management/D-conan/README.adoc index 3c5b23e..4c1121b 100644 --- a/07-package-management/D-conan/README.adoc +++ b/07-package-management/D-conan/README.adoc @@ -67,7 +67,7 @@ If you are using GCC compiler >= 5.1, Conan will set the compiler.libcxx to the [source,bash] ---- -$ conan profile update settings.compiler.libcxx=libstdc++11 default # Sets libcxx to C++11 ABI +$ conan profile update settings.compiler.libcxx=libstdc++11 default ---- [source,bash] @@ -89,7 +89,7 @@ build_type=Release You can find more information about this link:https://docs.conan.io/en/latest/howtos/manage_gcc_abi.html#manage-gcc-abi[here]. ==== -All examples provided will assume that the ABI being used for libstdc++ is the C++11 ABI. +All examples provided will assume that the ABI being used for libstdc++ is the Cpp11 ABI. # Finding Packages diff --git a/07-package-management/D-conan/basic/README.adoc b/07-package-management/D-conan/basic/README.adoc index 2632a83..6609df6 100644 --- a/07-package-management/D-conan/basic/README.adoc +++ b/07-package-management/D-conan/basic/README.adoc @@ -6,7 +6,7 @@ toc::[] # Introduction -link:http://conan.io[Conan] supports downloading libraries and making them available to an application developers. Packages are defined in the +link:https://docs.conan.io/en/latest/using_packages/conanfile_txt.htm[conanfile.txt]+ file, which defines packages, options, and the link:https://docs.conan.io/en/latest/reference/generators.html#generators-reference[generators] for your project. +link:http://conan.io[Conan] supports downloading libraries and making them available to an application developers. Packages are defined in the link:https://docs.conan.io/en/latest/using_packages/conanfile_txt.html[+conanfile.txt+] file, which defines packages, options, and the link:https://docs.conan.io/en/latest/reference/generators.html#generators-reference[generators] for your project. The files in this tutorial are below: