mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: Fix typos and grammar in docs and code

Browse Source 
No functional changes, just docs, comments and error messages.
This commit is contained in:
Craig Scott
2018-04-23 07:42:51 +10:00
parent fe0082875a
commit 8e841a473f
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Help/prop_tgt/AUTOMOC_MACRO_NAMES.rst
View File

@@ -25,8 +25,8 @@ with Qt.
Example Example
^^^^^^^ ^^^^^^^
In this case the the ``Q_OBJECT`` macro is hidden inside an other macro In this case the ``Q_OBJECT`` macro is hidden inside another macro
called ``CUSTOM_MACRO``. To let CMake know that source files, that contain called ``CUSTOM_MACRO``. To let CMake know that source files that contain
``CUSTOM_MACRO``, need to be ``moc`` processed, we call:: ``CUSTOM_MACRO`` need to be ``moc`` processed, we call::
set_property(TARGET tgt APPEND PROPERTY AUTOMOC_MACRO_NAMES "CUSTOM_MACRO") set_property(TARGET tgt APPEND PROPERTY AUTOMOC_MACRO_NAMES "CUSTOM_MACRO")

2
Help/variable/CMAKE_MODULE_PATH.rst
View File

@@ -2,6 +2,6 @@ CMAKE_MODULE_PATH
----------------- -----------------
:ref:`;-list <CMake Language Lists>` of directories specifying a search 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 :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. with CMake. By default it is empty, it is intended to be set by the project.

2
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@@ -793,7 +793,7 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2(
} }
} }
// Build a map that contains a the set of targets used by each local // Build a map that contains the set of targets used by each local
// generator directory level. // generator directory level.
void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks() void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
{ {

2
Source/cmQtAutoGen.h
View File

@@ -34,7 +34,7 @@ public:
/// @brief Returns the generator name in upper case /// @brief Returns the generator name in upper case
static std::string GeneratorNameUpper(GeneratorT genType); static std::string GeneratorNameUpper(GeneratorT genType);
/// @brief Returns a the string escaped and enclosed in quotes /// @brief Returns the string escaped and enclosed in quotes
static std::string Quoted(std::string const& text); static std::string Quoted(std::string const& text);
static std::string QuotedCommand(std::vector<std::string> const& command); static std::string QuotedCommand(std::vector<std::string> const& command);

4
Source/cmQtAutoGeneratorMocUic.cxx
View File

@@ -1884,7 +1884,7 @@ bool cmQtAutoGeneratorMocUic::ParallelJobPushMoc(JobHandleT& jobHandle)
error += Quoted(mocJob.IncluderFile); error += Quoted(mocJob.IncluderFile);
error += " and\n "; error += " and\n ";
error += Quoted(otherJob.IncluderFile); error += Quoted(otherJob.IncluderFile);
error += "\ncontain the the same moc include string "; error += "\ncontain the same moc include string ";
error += Quoted(mocJob.IncludeString); error += Quoted(mocJob.IncludeString);
error += "\nbut the moc file would be generated from different " error += "\nbut the moc file would be generated from different "
"source files\n "; "source files\n ";
@@ -1933,7 +1933,7 @@ bool cmQtAutoGeneratorMocUic::ParallelJobPushUic(JobHandleT& jobHandle)
error += Quoted(uicJob.IncluderFile); error += Quoted(uicJob.IncluderFile);
error += " and\n "; error += " and\n ";
error += Quoted(otherJob.IncluderFile); error += Quoted(otherJob.IncluderFile);
error += "\ncontain the the same uic include string "; error += "\ncontain the same uic include string ";
error += Quoted(uicJob.IncludeString); error += Quoted(uicJob.IncludeString);
error += "\nbut the uic file would be generated from different " error += "\nbut the uic file would be generated from different "
"source files\n "; "source files\n ";

4
Source/cmVisualStudioGeneratorOptions.cxx
View File

@@ -127,7 +127,7 @@ bool cmVisualStudioGeneratorOptions::IsManaged() const
bool cmVisualStudioGeneratorOptions::UsingUnicode() const bool cmVisualStudioGeneratorOptions::UsingUnicode() const
{ {
// Look for the a _UNICODE definition. // Look for a _UNICODE definition.
for (std::string const& di : this->Defines) { for (std::string const& di : this->Defines) {
if (di == "_UNICODE") { if (di == "_UNICODE") {
return true; return true;
@@ -137,7 +137,7 @@ bool cmVisualStudioGeneratorOptions::UsingUnicode() const
} }
bool cmVisualStudioGeneratorOptions::UsingSBCS() const bool cmVisualStudioGeneratorOptions::UsingSBCS() const
{ {
// Look for the a _SBCS definition. // Look for a _SBCS definition.
for (std::string const& di : this->Defines) { for (std::string const& di : this->Defines) {
if (di == "_SBCS") { if (di == "_SBCS") {
return true; return true;

2
Tests/QtAutogen/RerunRccDepends/CMakeLists.txt
View File

@@ -62,7 +62,7 @@ if (NOT rdGenAfter GREATER rdGenBefore)
endif() endif()
message("Changing a the .qrc file") message("Changing the .qrc file")
# - Acquire binary timestamps before the build # - Acquire binary timestamps before the build
file(TIMESTAMP "${rccDepBinPlain}" rdPlainBefore "${timeformat}") file(TIMESTAMP "${rccDepBinPlain}" rdPlainBefore "${timeformat}")
file(TIMESTAMP "${rccDepBinGen}" rdGenBefore "${timeformat}") file(TIMESTAMP "${rccDepBinGen}" rdGenBefore "${timeformat}")