diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-01 15:03:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-01 15:06:22 (GMT) |
| commit | ec16afc9e8aed8aebd387c416af5b5eef4ad337a (patch) | |
| tree | be6d5499b40bdabc602fda72eb9b0f6f150a3ece | |
| parent | 7ad49fa3339dd25c53b4166a8aa12fcf59cf4dad (diff) | |
| parent | ab06de68c54710136d50509833b2be937adba5c8 (diff) | |
| download | CMake-ec16afc9e8aed8aebd387c416af5b5eef4ad337a.zip CMake-ec16afc9e8aed8aebd387c416af5b5eef4ad337a.tar.gz CMake-ec16afc9e8aed8aebd387c416af5b5eef4ad337a.tar.bz2 | |
Merge topic 'typos'
ab06de68c5 Help: fixed typos in PCH / Unity Build doc
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3870
| -rw-r--r-- | Help/prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/UNITY_BUILD.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst | 2 | ||||
| -rw-r--r-- | Source/QtDialog/QCMake.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Help/prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM.rst b/Help/prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM.rst index d740303..9c3e7ea 100644 --- a/Help/prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM.rst +++ b/Help/prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM.rst @@ -1,7 +1,7 @@ PRECOMPILE_HEADERS_REUSE_FROM ----------------------------- -Target from which to reuse the precomipled headers build artifact. +Target from which to reuse the precompiled headers build artifact. See the second signature of :command:`target_precompile_headers` command for more detailed information. diff --git a/Help/prop_tgt/UNITY_BUILD.rst b/Help/prop_tgt/UNITY_BUILD.rst index d326ee2..beac5d4 100644 --- a/Help/prop_tgt/UNITY_BUILD.rst +++ b/Help/prop_tgt/UNITY_BUILD.rst @@ -31,7 +31,7 @@ ODR (One definition rule) errors ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Since multiple source files are included into one source file, -it can lead to ODR errors. This section contains properites +it can lead to ODR errors. This section contains properties which help fixing these errors. The source files marked by :prop_sf:`GENERATED` will be skipped diff --git a/Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst b/Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst index 2426689..84047f2 100644 --- a/Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst +++ b/Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst @@ -8,6 +8,6 @@ If the property is not set, CMake will use the value provided by :variable:`CMAKE_UNITY_BUILD_BATCH_SIZE`. By setting it to value `0` the generated unity source file will -contain all the source files that would be otherwise be split +contain all the source files that would otherwise be split into multiple batches. It is not recommended to do so, since it would affect performance. diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index ece3307..b608fcb 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -257,14 +257,14 @@ void QCMake::setProperties(const QCMakePropertyList& newProps) } } - // remove some properites + // remove some properties foreach (QString const& s, toremove) { this->CMakeInstance->UnwatchUnusedCli(s.toLocal8Bit().data()); state->RemoveCacheEntry(s.toLocal8Bit().data()); } - // add some new properites + // add some new properties foreach (QCMakeProperty const& s, props) { this->CMakeInstance->WatchUnusedCli(s.Key.toLocal8Bit().data()); |