Merge topic 'typos'

ab06de68c5 Help: fixed typos in PCH / Unity Build doc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3870
This commit is contained in:
Brad King
2019-10-01 15:03:14 +00:00
committed by Kitware Robot
4 changed files with 5 additions and 5 deletions
@@ -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.
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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.
+2 -2
View File
@@ -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());