diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-09 13:22:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-09 13:22:08 (GMT) |
| commit | b63dc7c8fc7a9d3487577dedf7dfabc63bc20817 (patch) | |
| tree | 94d7a4bd21d25c2a705bf5a72d56feef9ef524b9 /Modules | |
| parent | 88fa7b761d3ef2ba1c6326ed4d7069cb0e886a07 (diff) | |
| parent | 5d3b825cbdfe24c97f2f480a05990ad7c2e885d9 (diff) | |
| download | CMake-b63dc7c8fc7a9d3487577dedf7dfabc63bc20817.zip CMake-b63dc7c8fc7a9d3487577dedf7dfabc63bc20817.tar.gz CMake-b63dc7c8fc7a9d3487577dedf7dfabc63bc20817.tar.bz2 | |
Merge branch 'ExternalProject-minor-typos' into release-3.16
Merge-request: !3898
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/ExternalProject.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index e55ed46..66061a1 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -49,7 +49,7 @@ External Project Definition ``STAMP_DIR <dir>`` Directory in which to store the timestamps of each step. Log files from - individual steps are also created in here unless overriden by LOG_DIR + individual steps are also created in here unless overridden by LOG_DIR (see *Logging Options* below). ``LOG_DIR <dir>`` @@ -425,7 +425,7 @@ External Project Definition build directory or re-uses previous build contents. If the CMake generator is the ``Green Hills MULTI`` and not overridden then - the orginal projects settings for the GHS toolset and target system + the original project's settings for the GHS toolset and target system customization cache variables are propagated into the external project. ``SOURCE_SUBDIR <dir>`` |