diff --git a/chapters/features/modules.md b/chapters/features/modules.md index dda06ad..f217f2c 100644 --- a/chapters/features/modules.md +++ b/chapters/features/modules.md @@ -67,7 +67,7 @@ There are lots of options you can add, like `COMPILE_DEFINITIONS`. In CMake 3.8+ ## «module:FeatureSummary» -This is a fairly useful but rather odd module. It allows you to print out a list of packages what were searched for, as well as any options you explicity mark. It's partially but not completely tied into «command:`find_package`». You first include the module, as always: +This is a fairly useful but rather odd module. It allows you to print out a list of packages what were searched for, as well as any options you explicitly mark. It's partially but not completely tied into «command:`find_package`». You first include the module, as always: ```cmake include(FeatureSummary) diff --git a/chapters/intro/dodonot.md b/chapters/intro/dodonot.md index 1c4bb5f..d6a6413 100644 --- a/chapters/intro/dodonot.md +++ b/chapters/intro/dodonot.md @@ -43,7 +43,7 @@ at least as new as your compiler. * 3.13: Debian stable. * 3.16: Ubuntu 20.04. * 3.19: First to support Apple Silicon. -* latest: pip/conda-forge/homebew/chocolaty, ect. +* latest: pip/conda-forge/homebew/chocolaty, etc. ### What minimum to choose - Features: diff --git a/chapters/intro/newcmake.md b/chapters/intro/newcmake.md index b297ebc..ae6e359 100644 --- a/chapters/intro/newcmake.md +++ b/chapters/intro/newcmake.md @@ -1,7 +1,7 @@ # What's new in in CMake -This is an abbreviated version of the CMake changlog with just the highlights for authors. Names for each release are arbitrarily picked by the author. +This is an abbreviated version of the CMake changelog with just the highlights for authors. Names for each release are arbitrarily picked by the author. ## [CMake 3.0][] : Interface libraries diff --git a/chapters/intro/running.md b/chapters/intro/running.md index ea66f56..449cecf 100644 --- a/chapters/intro/running.md +++ b/chapters/intro/running.md @@ -61,7 +61,7 @@ You can build with a variety of tools; `make` is usually the default. To see all And you can pick a tool with `-G"My Tool"` (quotes only needed if spaces are in the tool name). You should pick a tool on your first CMake call in a directory, just like the compiler. Feel free to have several build directories, like `build/` and `buildXcode`. You can set the environment variable `CMAKE_GENERATOR` to control the default generator (CMake 3.15+). -Note that makefiles will only run in parallel if you explicilty pass a number of threads, such as `make -j2`, while Ninja will automatically run in parallel. You can directly pass a parallelization option such as `-j2` to the `cmake --build .` command in recent versions of CMake. +Note that makefiles will only run in parallel if you explicitly pass a number of threads, such as `make -j2`, while Ninja will automatically run in parallel. You can directly pass a parallelization option such as `-j2` to the `cmake --build .` command in recent versions of CMake. ## Setting options diff --git a/chapters/testing/googletest.md b/chapters/testing/googletest.md index 730366e..dfc1f45 100644 --- a/chapters/testing/googletest.md +++ b/chapters/testing/googletest.md @@ -56,9 +56,9 @@ Then, to add a test, I'd recommend the following macro: ```cmake macro(package_add_test TESTNAME) - # create an exectuable in which the tests will be stored + # create an executable in which the tests will be stored add_executable(${TESTNAME} ${ARGN}) - # link the Google test infrastructure, mocking library, and a default main fuction to + # link the Google test infrastructure, mocking library, and a default main function to # the test executable. Remove g_test_main if writing your own main function. target_link_libraries(${TESTNAME} gtest gmock gtest_main) # gtest_discover_tests replaces gtest_add_tests, diff --git a/examples/extended-project/docs/mainpage.md b/examples/extended-project/docs/mainpage.md index bf7f65e..01666af 100644 --- a/examples/extended-project/docs/mainpage.md +++ b/examples/extended-project/docs/mainpage.md @@ -6,6 +6,6 @@ It is good documentation because: 1. It exists. 2. I wrote it. -3. Everthing is documented (pretty easy since there's only one function) +3. Everything is documented (pretty easy since there's only one function) The single provided function is `::accumulate_vector`.