summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Source/CPack/cmCPackDragNDropGenerator.cxx2
-rw-r--r--Source/cmExtraEclipseCDT4Generator.cxx2
-rw-r--r--Source/cmGlobalBorlandMakefileGenerator.cxx2
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx2
-rw-r--r--Source/cmLocalGenerator.cxx6
-rw-r--r--Source/cmMakefile.cxx2
-rw-r--r--Source/cmMakefile.h2
-rw-r--r--Source/cmOrderDirectories.cxx2
-rw-r--r--Source/cmSystemTools.h2
-rw-r--r--Source/cmUVHandlePtr.cxx2
-rw-r--r--Source/cmake.cxx2
-rw-r--r--Source/cmcmd.cxx4
12 files changed, 15 insertions, 15 deletions
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 0d56e5fd0e..b71c969828 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -324,7 +324,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
staging << src_dir;
// Add a symlink to /Applications so users can drag-and-drop the bundle
- // into it unless this behaviour was disabled
+ // into it unless this behavior was disabled
if (!cpack_dmg_disable_applications_symlink) {
std::ostringstream application_link;
application_link << staging.str() << "/Applications";
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 5fbbef7ac4..824f5ed6cc 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -1097,7 +1097,7 @@ void cmExtraEclipseCDT4Generator::AppendStorageScanners(
compiler = "gcc";
}
- // the following right now hardcodes gcc behaviour :-/
+ // the following right now hardcodes gcc behavior :-/
std::string compilerArgs =
"-E -P -v -dD ${plugin_state_location}/${specs_file}";
if (!arg1.empty()) {
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx
index 996fcff1d8..b7bac9c130 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.cxx
+++ b/Source/cmGlobalBorlandMakefileGenerator.cxx
@@ -30,7 +30,7 @@ cmGlobalBorlandMakefileGenerator::cmGlobalBorlandMakefileGenerator(cmake* cm)
/*
* Borland Make does not support long line depend rule, as we have tested
* generate one source file includes 40000 header files, and generate
- * depend.make in one line(use line continued tag), and error occured:
+ * depend.make in one line(use line continued tag), and error occurred:
* ** Fatal CMakeFiles\main.dir\depend.make 1224: Rule line too long **
* we disable long line dependencies rule generation for Borland make
*/
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 97384cd5a8..248abffa64 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -147,7 +147,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
// write each target's progress.make this loop is done twice. Basically the
// Generate pass counts all the actions, the first loop below determines
// how many actions have progress updates for each target and writes to
- // corrrect variable values for everything except the all targets. The
+ // correct variable values for everything except the all targets. The
// second loop actually writes out correct values for the all targets as
// well. This is because the all targets require more information that is
// computed in the first loop.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 21a9a44546..b83a1876bb 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1972,7 +1972,7 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
}
}
- // Add VFS Overlay for Clang compiliers
+ // Add VFS Overlay for Clang compilers
if (compiler == "Clang") {
if (cmProp vfsOverlay =
this->Makefile->GetDefinition("CMAKE_CLANG_VFS_OVERLAY")) {
@@ -3931,7 +3931,7 @@ std::string ComputeCustomCommandRuleFileName(cmLocalGenerator& lg,
// The output path contains a generator expression, but we must choose
// a single source file path to which to attach the custom command.
- // Use some heuristics to provie a nice-looking name when possible.
+ // Use some heuristics to provide a nice-looking name when possible.
// If the only genex is $<CONFIG>, replace that gracefully.
{
@@ -4219,7 +4219,7 @@ std::vector<std::string> ComputeISPCObjectSuffixes(cmGeneratorTarget* target)
auto pos = ispcTarget.find('-');
auto target_suffix = ispcTarget.substr(0, pos);
if (target_suffix ==
- "avx1") { // when targetting avx1 ISPC uses the 'avx' output string
+ "avx1") { // when targeting avx1 ISPC uses the 'avx' output string
target_suffix = "avx";
}
ispcTarget = target_suffix;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index dba856037f..5a37bb9be3 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -800,7 +800,7 @@ void cmMakefile::RunListFile(cmListFile const& listFile,
for (size_t i = 0; i < defer->Commands.size(); ++i) {
DeferCommand& d = defer->Commands[i];
if (d.Id.empty()) {
- // Cancelled.
+ // Canceled.
continue;
}
// Mark as executed.
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 3c07808170..77e9c74050 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -993,7 +993,7 @@ private:
struct DeferCommand
{
- // Id is empty for an already-executed or cancelled operation.
+ // Id is empty for an already-executed or canceled operation.
std::string Id;
std::string FilePath;
cmListFileFunction Command;
diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx
index 68f40a9631..37c4afce0a 100644
--- a/Source/cmOrderDirectories.cxx
+++ b/Source/cmOrderDirectories.cxx
@@ -512,7 +512,7 @@ void cmOrderDirectories::VisitDirectory(unsigned int i)
}
// Now that all directories required to come before this one have
- // been emmitted, emit this directory.
+ // been emitted, emit this directory.
this->OrderedDirectories.push_back(this->OriginalDirectories[i]);
}
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 0aecf716fa..9f9c493a43 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -186,7 +186,7 @@ public:
*
* Output is controlled with outputflag. If outputflag is OUTPUT_NONE, no
* user-viewable output from the program being run will be generated.
- * OUTPUT_MERGE is the legacy behaviour where stdout and stderr are merged
+ * OUTPUT_MERGE is the legacy behavior where stdout and stderr are merged
* into stdout. OUTPUT_FORWARD copies the output to stdout/stderr as
* it was received. OUTPUT_PASSTHROUGH passes through the original handles.
*
diff --git a/Source/cmUVHandlePtr.cxx b/Source/cmUVHandlePtr.cxx
index 8ea19423da..e05b2d526d 100644
--- a/Source/cmUVHandlePtr.cxx
+++ b/Source/cmUVHandlePtr.cxx
@@ -128,7 +128,7 @@ template <>
struct uv_handle_deleter<uv_async_t>
{
/***
- * Wile uv_async_send is itself thread-safe, there are
+ * While uv_async_send is itself thread-safe, there are
* no strong guarantees that close hasn't already been
* called on the handle; and that it might be deleted
* as the send call goes through. This mutex guards
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 4130f5fbf2..a08babe3cd 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -485,7 +485,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
auto ScriptLambda = [&](std::string const& path, cmake* state) -> bool {
// Register fake project commands that hint misuse in script mode.
GetProjectCommandsInScriptMode(state->GetState());
- // Documented behaviour of CMAKE{,_CURRENT}_{SOURCE,BINARY}_DIR is to be
+ // Documented behavior of CMAKE{,_CURRENT}_{SOURCE,BINARY}_DIR is to be
// set to $PWD for -P mode.
state->SetHomeDirectory(cmSystemTools::GetCurrentWorkingDirectory());
state->SetHomeOutputDirectory(cmSystemTools::GetCurrentWorkingDirectory());
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 2c2ae4d17a..30347f23b9 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -1936,8 +1936,8 @@ int cmcmd::RunLLVMRC(std::vector<std::string> const& args)
skipNextArg = false;
continue;
}
- // We use ++ as seperator between the preprocessing step definition and
- // the rc compilation step becase we need to prepend a -- to seperate the
+ // We use ++ as separator between the preprocessing step definition and
+ // the rc compilation step because we need to prepend a -- to separate the
// source file properly from other options when using clang-cl for
// preprocessing.
if (arg == "++") {