From 33b3ea5683c2ecd49420651bf3fa1e7968d09139 Mon Sep 17 00:00:00 2001 From: Thom Troy Date: Sun, 18 Mar 2018 17:38:09 +0000 Subject: [PATCH] fix some typos --- 01-basic/B-hello-headers/README.adoc | 15 ++------------- 01-basic/C-static-library/README.adoc | 4 ++-- README.adoc | 2 +- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/01-basic/B-hello-headers/README.adoc b/01-basic/B-hello-headers/README.adoc index 1da9e91..b96cb52 100644 --- a/01-basic/B-hello-headers/README.adoc +++ b/01-basic/B-hello-headers/README.adoc @@ -84,21 +84,10 @@ file(GLOB SOURCES "src/*.cpp") ==== -[NOTE] -==== -An alternative to setting specific file names in the +SOURCES+ variable is -to use a GLOB command to find files using wildcard pattern matching. - -[source,cmake] ----- -file(GLOB SOURCES "src/*.cpp") ----- -==== - [TIP] ==== -For modern CMake it is normally recommend to not use a variable for sources and to -directly declare the sources in the add_xxx function. +For modern CMake it is NOT recommended to use a variable for sources. Insead it is +typical to directly declare the sources in the add_xxx function. This is particularly important for glob commands which may not always show you the correct results if you add a new source file. diff --git a/01-basic/C-static-library/README.adoc b/01-basic/C-static-library/README.adoc index 06b6f42..ec4ce71 100644 --- a/01-basic/C-static-library/README.adoc +++ b/01-basic/C-static-library/README.adoc @@ -7,8 +7,8 @@ toc::[] # Introduction Shows a hello world example which first creates and links a static library. This is a -simplified example showing the libray and binary in the same folder. Typically -these would be in sub-projects as described in section 02-sub-projects +simplified example showing the library and binary in the same folder. Typically +these would be in sub-projects as described in section link:../../02-sub-projects[02-sub-projects] The files in this tutorial are below: diff --git a/README.adoc b/README.adoc index 1481e18..4f1f5d0 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ https://cmake.org/[CMake] is a cross-platform open-source meta-build system whic can build, test and package software. It can be used to support multiple native build environments including make, Apple's xcode and Microsoft Visual Studio. -This repository includes some example CMake configurations which I have picked up +This repository includes some example modern CMake configurations which I have picked up when exploring it's usage for various projects. The examples are laid out in a tutorial like format. The first examples are very basic and slowly increase in complexity drawing on previous examples to show more complex use cases.