aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-06-05 10:26:41 +0200
committerDaniel Mensinger <daniel@mensinger-ka.de>2019-06-06 18:27:05 +0200
commit4abd2e71037658c691de23e7ca36787cd1aae12d (patch)
treebf381ca86a98d0c88fb1b5b7732f69f102a472d6 /docs
parent438ee6b01da9cc19d578242ceb1615ff3cdec920 (diff)
downloadmeson-4abd2e71037658c691de23e7ca36787cd1aae12d.zip
meson-4abd2e71037658c691de23e7ca36787cd1aae12d.tar.gz
meson-4abd2e71037658c691de23e7ca36787cd1aae12d.tar.bz2
cmake: doc: fixed typos
Diffstat (limited to 'docs')
-rw-r--r--docs/markdown/CMake-module.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/markdown/CMake-module.md b/docs/markdown/CMake-module.md
index 3b65253..94f4708 100644
--- a/docs/markdown/CMake-module.md
+++ b/docs/markdown/CMake-module.md
@@ -38,7 +38,7 @@ executable(exe1, ['sources'], dependencies: [cm_lib])
The `subproject` method is almost identical to the normal meson
`subproject` function. The only difference is that a CMake project
-instead of a meson prokect is configured.
+instead of a meson project is configured.
Also, project specific CMake options can be added with the `cmake_options` key.
@@ -81,13 +81,13 @@ subprojects in question.
### `subproject` object
-This is object is returned by the `subproject` function described above
+This object is returned by the `subproject` function described above
and supports the following methods:
- `dependency(target)` returns a dependency object for any CMake target.
- - `include_directories(target)` returns a meson include_directories
- for the specified target. Using this function is not neccessary if the
- dependency object is used.
+ - `include_directories(target)` returns a meson `include_directories()`
+ object for the specified target. Using this function is not neccessary
+ if the dependency object is used.
- `target(target)` returns the raw build target.
- `target_type(target)` returns the type of the target as a string
- `target_list()` returns a list of all target *names*.