diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-23 14:21:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-23 14:22:00 (GMT) |
| commit | 97ecefa73b54b7c585e2e16cee844b943ccf062f (patch) | |
| tree | 1bb478e0d7cda51cf201c882d6955b3fddfca6e2 /Help | |
| parent | 152c636130491b2631395a89511544c0edfa8243 (diff) | |
| parent | 8e841a473f1e037d3e8102a23281a593afa2daab (diff) | |
| download | CMake-97ecefa73b54b7c585e2e16cee844b943ccf062f.zip CMake-97ecefa73b54b7c585e2e16cee844b943ccf062f.tar.gz CMake-97ecefa73b54b7c585e2e16cee844b943ccf062f.tar.bz2 | |
Merge topic 'grammar_typo_fixes'
8e841a473f Cleanup: Fix typos and grammar in docs and code
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1996
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/prop_tgt/AUTOMOC_MACRO_NAMES.rst | 6 | ||||
| -rw-r--r-- | Help/variable/CMAKE_MODULE_PATH.rst | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Help/prop_tgt/AUTOMOC_MACRO_NAMES.rst b/Help/prop_tgt/AUTOMOC_MACRO_NAMES.rst index a5ad9d5..a9a0ecf 100644 --- a/Help/prop_tgt/AUTOMOC_MACRO_NAMES.rst +++ b/Help/prop_tgt/AUTOMOC_MACRO_NAMES.rst @@ -25,8 +25,8 @@ with Qt. Example ^^^^^^^ -In this case the the ``Q_OBJECT`` macro is hidden inside an other macro -called ``CUSTOM_MACRO``. To let CMake know that source files, that contain -``CUSTOM_MACRO``, need to be ``moc`` processed, we call:: +In this case the ``Q_OBJECT`` macro is hidden inside another macro +called ``CUSTOM_MACRO``. To let CMake know that source files that contain +``CUSTOM_MACRO`` need to be ``moc`` processed, we call:: set_property(TARGET tgt APPEND PROPERTY AUTOMOC_MACRO_NAMES "CUSTOM_MACRO") diff --git a/Help/variable/CMAKE_MODULE_PATH.rst b/Help/variable/CMAKE_MODULE_PATH.rst index 5ea7cbb..6490054 100644 --- a/Help/variable/CMAKE_MODULE_PATH.rst +++ b/Help/variable/CMAKE_MODULE_PATH.rst @@ -2,6 +2,6 @@ CMAKE_MODULE_PATH ----------------- :ref:`;-list <CMake Language Lists>` of directories specifying a search path -for CMake modules to be loaded by the the :command:`include` or +for CMake modules to be loaded by the :command:`include` or :command:`find_package` commands before checking the default modules that come with CMake. By default it is empty, it is intended to be set by the project. |