From b6d2b9eca6e41052f68efcc7029fd020eeeea1eb Mon Sep 17 00:00:00 2001 From: Li Cao Date: Fri, 20 Mar 2020 15:12:57 +0800 Subject: [PATCH] [typo] fix some typos in 01 --- 01-basic/G-compile-flags/README.adoc | 2 +- 01-basic/H-third-party-library/README.adoc | 4 ++-- 01-basic/I-compiling-with-clang/README.adoc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/01-basic/G-compile-flags/README.adoc b/01-basic/G-compile-flags/README.adoc index fed5cf8..5c885ed 100644 --- a/01-basic/G-compile-flags/README.adoc +++ b/01-basic/G-compile-flags/README.adoc @@ -70,7 +70,7 @@ For more details, see https://cmake.org/cmake/help/v3.0/command/set.html[here] ==== -Once set the +CMAKE_C_FLAGS+ and +CMAKE_CXX_FLAGS+ will set a compler flag / definition globally for all targets in this directory or any included sub-directories. This method is not recommended for general usage now and the +target_compile_definitions+ function is preferred. +Once set the +CMAKE_C_FLAGS+ and +CMAKE_CXX_FLAGS+ will set a compiler flag / definition globally for all targets in this directory or any included sub-directories. This method is not recommended for general usage now and the +target_compile_definitions+ function is preferred. ### Set CMake Flags diff --git a/01-basic/H-third-party-library/README.adoc b/01-basic/H-third-party-library/README.adoc index 2fdb5d7..c6fbf0d 100644 --- a/01-basic/H-third-party-library/README.adoc +++ b/01-basic/H-third-party-library/README.adoc @@ -60,7 +60,7 @@ More complex setups are provided in later examples. ## Checking if the package is found -Most included packages will set a variable `XXX_FOUND`, which can used to check +Most included packages will set a variable `XXX_FOUND`, which can be used to check if the package is available on the system. In this example the variable is `Boost_FOUND`: @@ -122,7 +122,7 @@ To link against an imported target you can use the following: While most modern libraries use imported targets, not all modules have been updated. In the case where a library hasn't been updated you will often find the following variables available: - * xxx_INCLUDE_DIRS - A varialble pointing to the include directory for the library. + * xxx_INCLUDE_DIRS - A variable pointing to the include directory for the library. * xxx_LIBRARY - A variable pointing to the library path. These can then be added to your +target_include_directories+ and +target_link_libraries+ as: diff --git a/01-basic/I-compiling-with-clang/README.adoc b/01-basic/I-compiling-with-clang/README.adoc index d008f76..3d4ae9c 100644 --- a/01-basic/I-compiling-with-clang/README.adoc +++ b/01-basic/I-compiling-with-clang/README.adoc @@ -57,7 +57,7 @@ Below is an example of passing the compiler via the command line. cmake .. -DCMAKE_C_COMPILER=clang-3.6 -DCMAKE_CXX_COMPILER=clang++-3.6 ---- -After setting these options when your run `make` clang will be used to compile your binary. This +After setting these options, when your run `make` clang will be used to compile your binary. This can be seen from the following lines in the make output. [source,bash]