Merge topic 'various-typos'

3ab7bf82 Various typo fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1626

Source/CPack/IFW/cmCPackIFWGenerator.cxx

@@ -61,7 +61,7 @@ int cmCPackIFWGenerator::PackageFiles()
         }
       } else {
         cmCPackIFWLogger(WARNING, "The \"CPACK_IFW_REPOSITORIES_DIRECTORIES\" "
-                           << "variable is set, but content will be skiped, "
+                           << "variable is set, but content will be skipped, "
                            << "because this feature available only since "
                            << "QtIFW 3.1. Please update your QtIFW instance."
                            << std::endl);

Source/CTest/cmCTestMemCheckHandler.cxx

@@ -176,7 +176,7 @@ void cmCTestMemCheckHandler::GenerateTestCommand(
   }
   // Create a copy of the memory tester environment variable.
   // This is used for memory testing programs that pass options
-  // via environment varaibles.
+  // via environment variables.
   std::string memTesterEnvironmentVariable =
     this->MemoryTesterEnvironmentVariable;
   for (std::string const& arg : this->MemoryTesterOptions) {

Source/CTest/cmParseMumpsCoverage.cxx

@@ -114,7 +114,7 @@ bool cmParseMumpsCoverage::LoadPackages(const char* d)
   for (std::string& file : glob.GetFiles()) {
     std::string name = cmSystemTools::GetFilenameName(file);
     this->RoutineToDirectory[name.substr(0, name.size() - 2)] = file;
-    // initialze each file, this is left out until CDash is fixed
+    // initialize each file, this is left out until CDash is fixed
     // to handle large numbers of files
     this->InitializeMumpsFile(file);
   }

Source/QtDialog/CMakeLists.txt

@@ -40,7 +40,7 @@ if (Qt5Widgets_FOUND)
   endif()
 
   # We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows.
-  # FIXME: This should be part of Qt5 CMake scripts, but unfortunatelly
+  # FIXME: This should be part of Qt5 CMake scripts, but unfortunately
   # Qt5 support is missing there.
   if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
     macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var)

Source/cmCommands.cxx

@@ -343,7 +343,7 @@ void GetProjectCommandsInScriptMode(cmState* state)
   CM_UNEXPECTED_PROJECT_COMMAND("try_compile");
   CM_UNEXPECTED_PROJECT_COMMAND("try_run");
 
-  // deprected commands
+  // deprecated commands
   CM_UNEXPECTED_PROJECT_COMMAND("export_library_dependencies");
   CM_UNEXPECTED_PROJECT_COMMAND("load_command");
   CM_UNEXPECTED_PROJECT_COMMAND("output_required_files");

Source/cmDependsFortran.cxx

@@ -583,7 +583,7 @@ bool cmDependsFortran::ModulesDiffer(const char* modFile,
     A mod file is a binary file.
     However, looking into both generated bar.mod files with a hex editor
     shows that they differ only before a sequence linefeed-zero (0x0A 0x00)
-    which is located some bytes in front of the absoulte path to the source
+    which is located some bytes in front of the absolute path to the source
     file.
 
   sun:

Source/cmDependsFortran.h

@@ -64,7 +64,7 @@ protected:
                          const std::string& file, std::ostream& makeDepends,
                          std::ostream& internalDepends) override;
 
-  // Actually write the depenencies to the streams.
+  // Actually write the dependencies to the streams.
   bool WriteDependenciesReal(const char* obj, cmFortranSourceInfo const& info,
                              std::string const& mod_dir, const char* stamp_dir,
                              std::ostream& makeDepends,

Source/cmExportInstallAndroidMKGenerator.h

@@ -22,7 +22,7 @@ class cmInstallExportGenerator;
  * cmExportInstallAndroidMKGenerator generates files exporting targets from
  * install an installation tree.  The files are placed in a temporary
  * location for installation by cmInstallExportGenerator.  The file format
- * is for the ndk build system and is a makefile fragment specifing prebuilt
+ * is for the ndk build system and is a makefile fragment specifying prebuilt
  * libraries to the ndk build system.
  *
  * This is used to implement the INSTALL(EXPORT_ANDROID_MK) command.

Source/cmFilePathChecksum.h

@@ -29,13 +29,13 @@ public:
   /// @brief Parent directories are empty
   cmFilePathChecksum();
 
-  /// @brief Initilizes the parent directories manually
+  /// @brief Initializes the parent directories manually
   cmFilePathChecksum(std::string const& currentSrcDir,
                      std::string const& currentBinDir,
                      std::string const& projectSrcDir,
                      std::string const& projectBinDir);
 
-  /// @brief Initilizes the parent directories from a makefile
+  /// @brief Initializes the parent directories from a makefile
   cmFilePathChecksum(cmMakefile* makefile);
 
   /// @brief Allows parent directories setup after construction

Source/cmGeneratorTarget.cxx

@@ -2166,7 +2166,7 @@ void cmTargetTraceDependencies::Trace()
     // Queue the source needed to generate this file, if any.
     this->FollowName(sf->GetFullPath());
 
-    // Queue dependencies added programatically by commands.
+    // Queue dependencies added programmatically by commands.
     this->FollowNames(sf->GetDepends());
 
     // Queue custom command dependencies.
@@ -5154,7 +5154,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLanguages(
   std::set<std::string> languages;
   // Get languages used in our source files.
   this->GetLanguages(languages, config);
-  // Copy the set of langauges to the link implementation.
+  // Copy the set of languages to the link implementation.
   impl.Languages.insert(impl.Languages.begin(), languages.begin(),
                         languages.end());
 }

Source/cmGlobalXCodeGenerator.cxx

@@ -3218,7 +3218,7 @@ void cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
                        << this->ConvertToRelativeForMake(tfull.c_str())
                        << "\n";
         // if building for more than one architecture
-        // then remove those exectuables as well
+        // then remove those executables as well
         if (this->Architectures.size() > 1) {
           std::string universal = this->GetObjectsNormalDirectory(
             this->CurrentProject, configName, gt);

Source/cmLocalUnixMakefileGenerator3.cxx

@@ -1161,7 +1161,7 @@ void cmLocalUnixMakefileGenerator3::AppendEcho(
         commands.push_back(cmd);
       }
 
-      // Reset the line to emtpy.
+      // Reset the line to empty.
       line.clear();
 
       // Progress appears only on first line.

Source/cmMakefile.h

@@ -191,7 +191,7 @@ public:
   };
 
   /**
-   * Add a utility to the build.  A utiltity target is a command that
+   * Add a utility to the build.  A utility target is a command that
    * is run every time the target is built.
    */
   cmTarget* AddUtilityCommand(const std::string& utilityName,

Source/cmMakefileTargetGenerator.cxx

@@ -884,7 +884,7 @@ bool cmMakefileTargetGenerator::WriteMakeRule(
   for (std::vector<std::string>::const_iterator o = outputs.begin() + 1;
        o != outputs.end(); ++o) {
     // Touch the extra output so "make" knows that it was updated,
-    // but only if the output was acually created.
+    // but only if the output was actually created.
     std::string const out = this->LocalGenerator->ConvertToOutputFormat(
       this->LocalGenerator->MaybeConvertToRelativePath(binDir, *o),
       cmOutputConverter::SHELL);

Source/cmProjectCommand.cxx

@@ -98,7 +98,7 @@ bool cmProjectCommand::InitialPass(std::vector<std::string> const& args,
     } else if (args[i] == "DESCRIPTION") {
       if (haveDescription) {
         this->Makefile->IssueMessage(
-          cmake::FATAL_ERROR, "DESCRITPION may be specified at most once.");
+          cmake::FATAL_ERROR, "DESCRIPTION may be specified at most once.");
         cmSystemTools::SetFatalErrorOccured();
         return true;
       }

Source/cmQtAutoGeneratorMocUic.cxx

@@ -234,7 +234,7 @@ bool cmQtAutoGeneratorMocUic::InitInfoFile(cmMakefile* makefile)
       // Compare list sizes
       if (sources.size() != options.size()) {
         std::ostringstream ost;
-        ost << "files/options lists sizes missmatch (" << sources.size() << "/"
+        ost << "files/options lists sizes mismatch (" << sources.size() << "/"
             << options.size() << ")";
         this->LogFileError(cmQtAutoGen::UIC, this->GetInfoFile(), ost.str());
         return false;

Source/cmSourceFile.cxx

@@ -110,7 +110,7 @@ std::string const& cmSourceFile::GetFullPath() const
 
 bool cmSourceFile::FindFullPath(std::string* error)
 {
-  // If thie method has already failed once do not try again.
+  // If this method has already failed once do not try again.
   if (this->FindFullPathFailed) {
     return false;
   }

Source/cmSourceFileLocation.h

@@ -38,12 +38,12 @@ public:
   bool Matches(cmSourceFileLocation const& loc);
 
   /**
-   * Explicity state that the source file is located in the source tree.
+   * Explicitly state that the source file is located in the source tree.
    */
   void DirectoryUseSource();
 
   /**
-   * Explicity state that the source file is located in the build tree.
+   * Explicitly state that the source file is located in the build tree.
    */
   void DirectoryUseBinary();
 

Source/cmSystemTools.h

@@ -59,7 +59,7 @@ public:
    *  Set the function used by GUIs to display error messages
    *  Function gets passed: message as a const char*,
    *  title as a const char*, and a reference to bool that when
-   *  set to false, will disable furthur messages (cancel).
+   *  set to false, will disable further messages (cancel).
    */
   static void SetMessageCallback(MessageCallback f,
                                  void* clientData = nullptr);
@@ -167,7 +167,7 @@ public:
    * to be at the end of the string and it does not support ?
    * []... The optional argument type specifies what kind of files you
    * want to find. 0 means all files, -1 means directories, 1 means
-   * files only. This method returns true if search was succesfull.
+   * files only. This method returns true if search was successful.
    */
   static bool SimpleGlob(const std::string& glob,
                          std::vector<std::string>& files, int type = 0);
@@ -229,7 +229,7 @@ public:
   /**
    * In this version of RunSingleCommand, command[0] should be
    * the command to run, and each argument to the command should
-   * be in comand[1]...command[command.size()]
+   * be in command[1]...command[command.size()]
    */
   static bool RunSingleCommand(std::vector<std::string> const& command,
                                std::string* captureStdOut = nullptr,

Source/cmTargetLinkLibrariesCommand.cxx

@@ -242,7 +242,7 @@ bool cmTargetLinkLibrariesCommand::InitialPass(
       // Lookup old-style cache entry if type is unspecified.  So if you
       // do a target_link_libraries(foo optimized bar) it will stay optimized
       // and not use the lookup.  As there may be the case where someone has
-      // specifed that a library is both debug and optimized.  (this check is
+      // specified that a library is both debug and optimized.  (this check is
       // only there for backwards compatibility when mixing projects built
       // with old versions of CMake and new)
       llt = GENERAL_LibraryType;

Source/cmVisualStudioGeneratorOptions.cxx

@@ -317,7 +317,7 @@ void cmVisualStudioGeneratorOptions::FixManifestUACFlags()
       continue;
     }
 
-    // unknwon sub option
+    // unknown sub option
   }
 
   AddFlag(ENABLE_UAC, "true");

Source/cmXMLWriter.h

@@ -108,7 +108,7 @@ private:
    * It would be tempting to convert a time_point to number of seconds by
    * using time_since_epoch(). Unfortunately the C++11 standard does not
    * specify what the epoch of the system_clock must be.
-   * Therefore we must assume it is an arbitary point in time. Instead of this
+   * Therefore we must assume it is an arbitrary point in time. Instead of this
    * method, it is recommended to convert it by means of the to_time_t method.
    */
   static std::time_t SafeContent(