diff options
author | Brad King <brad.king@kitware.com> | 2018-06-05 15:26:04 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-05 15:26:12 (GMT) |
commit | 8dbccd050c347dacbc4a40ace6253b0c61db86b6 (patch) | |
tree | 0a7a0a46eabcd0f7a469e64ee35f27e81bbc4634 | |
parent | 054bc6a330316f96f1398fa511cd4a7bd66c89a6 (diff) | |
parent | be281068806891f725fa82583ffb97112872f618 (diff) | |
download | CMake-8dbccd050c347dacbc4a40ace6253b0c61db86b6.zip CMake-8dbccd050c347dacbc4a40ace6253b0c61db86b6.tar.gz CMake-8dbccd050c347dacbc4a40ace6253b0c61db86b6.tar.bz2 |
Merge topic 'more-misc-typos'
be28106880 Fix misc. typos
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !2130
34 files changed, 45 insertions, 45 deletions
diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt index 8f34b75..48a1a71 100644 --- a/Help/command/FIND_XXX.txt +++ b/Help/command/FIND_XXX.txt @@ -82,7 +82,7 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows: as a stack so if called from nested find modules, root paths from the parent's find module will be searched after paths from the current module, i.e. ``CurrentPackage_ROOT``, ``ENV{CurrentPackage_ROOT}``, - ``ParentPackage_ROOT``, ``ENV{ParentPacakge_ROOT}``, etc. + ``ParentPackage_ROOT``, ``ENV{ParentPackage_ROOT}``, etc. This can be skipped if ``NO_PACKAGE_ROOT_PATH`` is passed. See policy :policy:`CMP0074`. diff --git a/Help/release/3.0.rst b/Help/release/3.0.rst index d02f940..64491e3 100644 --- a/Help/release/3.0.rst +++ b/Help/release/3.0.rst @@ -224,7 +224,7 @@ Modules option to change the ``boost`` prefix on library names. * The :module:`FindBoost` module learned to control search - for libraies with the ``g`` tag (for MS debug runtime) with + for libraries with the ``g`` tag (for MS debug runtime) with a new ``Boost_USE_DEBUG_RUNTIME`` option. It is ``ON`` by default to preserve existing behavior. diff --git a/Help/variable/CMAKE_HOST_SYSTEM.rst b/Help/variable/CMAKE_HOST_SYSTEM.rst index c2a8f1a..12d11d1 100644 --- a/Help/variable/CMAKE_HOST_SYSTEM.rst +++ b/Help/variable/CMAKE_HOST_SYSTEM.rst @@ -1,7 +1,7 @@ CMAKE_HOST_SYSTEM ----------------- -Composit Name of OS CMake is being run on. +Composite Name of OS CMake is being run on. This variable is the composite of :variable:`CMAKE_HOST_SYSTEM_NAME` and :variable:`CMAKE_HOST_SYSTEM_VERSION`, e.g. diff --git a/Help/variable/CMAKE_OSX_ARCHITECTURES.rst b/Help/variable/CMAKE_OSX_ARCHITECTURES.rst index 93916dd..51b840d 100644 --- a/Help/variable/CMAKE_OSX_ARCHITECTURES.rst +++ b/Help/variable/CMAKE_OSX_ARCHITECTURES.rst @@ -4,7 +4,7 @@ CMAKE_OSX_ARCHITECTURES Target specific architectures for OS X and iOS. This variable is used to initialize the :prop_tgt:`OSX_ARCHITECTURES` -property on each target as it is creaed. See that target property +property on each target as it is created. See that target property for additional information. .. include:: CMAKE_OSX_VARIABLE.txt diff --git a/Modules/CMakeSystemSpecificInitialize.cmake b/Modules/CMakeSystemSpecificInitialize.cmake index de4d7f5..21bcd40 100644 --- a/Modules/CMakeSystemSpecificInitialize.cmake +++ b/Modules/CMakeSystemSpecificInitialize.cmake @@ -15,7 +15,7 @@ # An example are the platforms supported by Xcode (macOS, iOS, tvOS, # and watchOS). For all of those the CMAKE_EFFECTIVE_SYSTEM_NAME is # set to Apple which results in using -# Platfom/Apple-AppleClang-CXX.cmake for the Apple C++ compiler. +# Platform/Apple-AppleClang-CXX.cmake for the Apple C++ compiler. set(CMAKE_EFFECTIVE_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}") include(Platform/${CMAKE_SYSTEM_NAME}-Initialize OPTIONAL) diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 067e290..fdbae32 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -1031,7 +1031,7 @@ function(cpack_deb_prepare_package_vars) "CPACK_DEBIAN_FILE_NAME") if(CPACK_DEBIAN_FILE_NAME) if(CPACK_DEBIAN_FILE_NAME STREQUAL "DEB-DEFAULT") - # Patch package file name to be in corrent debian format: + # Patch package file name to be in correct debian format: # <foo>_<VersionNumber>-<DebianRevisionNumber>_<DebianArchitecture>.deb set(CPACK_OUTPUT_FILE_NAME "${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb") diff --git a/Modules/CPackNuGet.cmake b/Modules/CPackNuGet.cmake index a3edd75..05403bc 100644 --- a/Modules/CPackNuGet.cmake +++ b/Modules/CPackNuGet.cmake @@ -5,7 +5,7 @@ CPackNuGet ---------- -When build a NuGet pacakge there is no direct way to control an output +When build a NuGet package there is no direct way to control an output filename due a lack of the corresponding CLI option of NuGet, so there is no ``CPACK_NUGET_PACKAGE_FILENAME`` variable. To form the output filename NuGet uses the package name and the version according to its built-in rules. @@ -509,7 +509,7 @@ else() if(CPACK_NUGET_GROUPS) _cpack_nuget_debug("---[Making grouped component(s) package(s)]---") foreach(_group IN LISTS CPACK_NUGET_GROUPS) - _cpack_nuget_debug("Starting to make the pacakge for group `${_group}`") + _cpack_nuget_debug("Starting to make the package for group `${_group}`") string(MAKE_C_IDENTIFIER "${_group}" _group_up) string(TOUPPER "${_group_up}" _group_up) @@ -531,11 +531,11 @@ else() if(CPACK_NUGET_COMPONENTS) _cpack_nuget_debug("---[Making single-component(s) package(s)]---") foreach(_comp IN LISTS CPACK_NUGET_COMPONENTS) - _cpack_nuget_debug("Starting to make the pacakge for component `${_comp}`") + _cpack_nuget_debug("Starting to make the package for component `${_comp}`") # Render a spec file which includes only given component unset(_CPACK_NUGET_FILES_TAG) _cpack_nuget_make_files_tag(${_comp}) - # Temporary set `CPACK_NUGET_PACKAGE_COMPONENT` to the the current + # Temporary set `CPACK_NUGET_PACKAGE_COMPONENT` to the current # component name to properly collect various per group settings set(CPACK_NUGET_PACKAGE_COMPONENT ${_comp}) _cpack_nuget_render_spec() diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 874fb89..21cace3 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -569,7 +569,7 @@ else() endif() # Propagate the host flags to the host compiler via -Xcompiler -option(CUDA_PROPAGATE_HOST_FLAGS "Propage C/CXX_FLAGS and friends to the host compiler via -Xcompile" ON) +option(CUDA_PROPAGATE_HOST_FLAGS "Propagate C/CXX_FLAGS and friends to the host compiler via -Xcompile" ON) # Enable CUDA_SEPARABLE_COMPILATION option(CUDA_SEPARABLE_COMPILATION "Compile CUDA objects with separable compilation enabled. Requires CUDA 5.0+" OFF) diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index b03f793..54e62db 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -591,7 +591,7 @@ function(matlab_get_mex_suffix matlab_root mex_suffix) set(devnull INPUT_FILE NUL) endif() - # this is the prefered way. If this does not work properly (eg. MCR on Windows), then we use our own knowledge + # this is the preferred way. If this does not work properly (eg. MCR on Windows), then we use our own knowledge execute_process( COMMAND ${Matlab_MEXEXTENSIONS_PROG} OUTPUT_VARIABLE _matlab_mex_extension diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake index 9903a6d..ddbd607 100644 --- a/Modules/FindPython/Support.cmake +++ b/Modules/FindPython/Support.cmake @@ -290,7 +290,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS) if (${_PYTHON_PREFIX}_EXECUTABLE AND ${_PYTHON_PREFIX}_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR) set (${_PYTHON_PREFIX}_Interpreter_FOUND TRUE) - # Use interpreter version for future searchs to ensure consistency + # Use interpreter version for future searches to ensure consistency set (_${_PYTHON_PREFIX}_FIND_VERSIONS ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR}) endif() @@ -418,7 +418,7 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS) endif() elseif (${_PYTHON_PREFIX}_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR) set (${_PYTHON_PREFIX}_Compiler_FOUND TRUE) - # Use compiler version for future searchs to ensure consistency + # Use compiler version for future searches to ensure consistency set (_${_PYTHON_PREFIX}_FIND_VERSIONS ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR}) endif() endif() @@ -774,7 +774,7 @@ if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS if ((${_PYTHON_PREFIX}_LIBRARY_RELEASE OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG) AND ${_PYTHON_PREFIX}_INCLUDE_DIR) if (${_PYTHON_PREFIX}_Interpreter_FOUND OR ${_PYTHON_PREFIX}_Compiler_FOUND) - # devlopment environment must be compatible with interpreter/compiler + # development environment must be compatible with interpreter/compiler if (${_${_PYTHON_PREFIX}_VERSION_MAJOR}.${_${_PYTHON_PREFIX}_VERSION_MINOR} VERSION_EQUAL ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR}) set (${_PYTHON_PREFIX}_Development_FOUND TRUE) endif() diff --git a/Source/CPack/IFW/cmCPackIFWPackage.cxx b/Source/CPack/IFW/cmCPackIFWPackage.cxx index 4c84612..f24ab69 100644 --- a/Source/CPack/IFW/cmCPackIFWPackage.cxx +++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx @@ -126,10 +126,10 @@ void cmCPackIFWPackage::DefaultConfiguration() this->RequiresAdminRights.clear(); } -// Defaul configuration (all in one package) +// Default configuration (all in one package) int cmCPackIFWPackage::ConfigureFromOptions() { - // Restore defaul configuration + // Restore default configuration this->DefaultConfiguration(); // Name @@ -168,7 +168,7 @@ int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent* component) return 0; } - // Restore defaul configuration + // Restore default configuration this->DefaultConfiguration(); std::string prefix = "CPACK_IFW_COMPONENT_" + @@ -256,7 +256,7 @@ int cmCPackIFWPackage::ConfigureFromGroup(cmCPackComponentGroup* group) return 0; } - // Restore defaul configuration + // Restore default configuration this->DefaultConfiguration(); std::string prefix = "CPACK_IFW_COMPONENT_GROUP_" + diff --git a/Source/CPack/cmCPackLog.h b/Source/CPack/cmCPackLog.h index 10deda4..8e99221 100644 --- a/Source/CPack/cmCPackLog.h +++ b/Source/CPack/cmCPackLog.h @@ -84,7 +84,7 @@ public: bool SetLogOutputFile(const char* fname); //! Set the various prefixes for the logging. SetPrefix sets the generic - // prefix that overwrittes missing ones. + // prefix that overwrites missing ones. void SetPrefix(std::string const& pfx) { this->Prefix = pfx; } void SetOutputPrefix(std::string const& pfx) { this->OutputPrefix = pfx; } void SetVerbosePrefix(std::string const& pfx) { this->VerbosePrefix = pfx; } diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h index e881252..cf91b4f 100644 --- a/Source/CTest/cmCTestGenericHandler.h +++ b/Source/CTest/cmCTestGenericHandler.h @@ -25,7 +25,7 @@ class cmCTestGenericHandler { public: /** - * If verbose then more informaiton is printed out + * If verbose then more information is printed out */ void SetVerbose(bool val) { diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h index 9218294..8880dac 100644 --- a/Source/CTest/cmCTestMemCheckHandler.h +++ b/Source/CTest/cmCTestMemCheckHandler.h @@ -127,7 +127,7 @@ private: //! Parse Valgrind/Purify/Bounds Checker result out of the output // string. After running, log holds the output and results hold the - // different memmory errors. + // different memory errors. bool ProcessMemCheckOutput(const std::string& str, std::string& log, std::vector<int>& results); bool ProcessMemCheckValgrindOutput(const std::string& str, std::string& log, diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index e729eeb..927797a 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -558,7 +558,7 @@ bool cmCTestRunTest::StartTest(size_t total) void cmCTestRunTest::ComputeArguments() { - this->Arguments.clear(); // reset becaue this might be a rerun + this->Arguments.clear(); // reset because this might be a rerun std::vector<std::string>::const_iterator j = this->TestProperties->Args.begin(); ++j; // skip test name diff --git a/Source/Checks/Curses.cmake b/Source/Checks/Curses.cmake index 46dc770..2942b66 100644 --- a/Source/Checks/Curses.cmake +++ b/Source/Checks/Curses.cmake @@ -26,7 +26,7 @@ try_compile(CMakeCheckCurses_COMPILED OUTPUT_VARIABLE CMakeCheckCurses_OUTPUT ) -# Covnert result from cache entry to normal variable. +# Convert result from cache entry to normal variable. set(CMakeCheckCurses_COMPILED "${CMakeCheckCurses_COMPILED}") unset(CMakeCheckCurses_COMPILED CACHE) diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h index 7f5b3ca..2c006cf 100644 --- a/Source/CursesDialog/cmCursesMainForm.h +++ b/Source/CursesDialog/cmCursesMainForm.h @@ -125,7 +125,7 @@ protected: std::vector<cmCursesCacheEntryComposite*>* Entries; // Errors produced during last run of cmake std::vector<std::string> Errors; - // Command line argumens to be passed to cmake each time + // Command line arguments to be passed to cmake each time // it is run std::vector<std::string> Args; // Message displayed when user presses 'h' diff --git a/Source/CursesDialog/form/frm_post.c b/Source/CursesDialog/form/frm_post.c index 924fe6a..fc0a359 100644 --- a/Source/CursesDialog/form/frm_post.c +++ b/Source/CursesDialog/form/frm_post.c @@ -67,7 +67,7 @@ int post_form(FORM * form) if ((form->cols > width) || (form->rows > height)) RETURN(E_NO_ROOM); - /* reset form->curpage to an invald value. This forces Set_Form_Page + /* reset form->curpage to an invalid value. This forces Set_Form_Page to do the page initialization which is required by post_form. */ page = form->curpage; diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx index 5bcaa45..a107294 100644 --- a/Source/bindexplib.cxx +++ b/Source/bindexplib.cxx @@ -390,7 +390,7 @@ bool bindexplib::AddDefinitionFile(const char* filename) } std::string str; while (std::getline(infile, str)) { - // skip the LIBRAY and EXPORTS lines (if any) + // skip the LIBRARY and EXPORTS lines (if any) if ((str.compare(0, 7, "LIBRARY") == 0) || (str.compare(0, 7, "EXPORTS") == 0)) { continue; diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 603bb41..ddeab1a 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -139,7 +139,7 @@ public: */ int TestDirectory(bool memcheck); - /** what is the configuraiton type, e.g. Debug, Release etc. */ + /** what is the configuration type, e.g. Debug, Release etc. */ std::string const& GetConfigType(); cmDuration GetTimeOut() { return this->TimeOut; } void SetTimeOut(cmDuration t) { this->TimeOut = t; } @@ -561,7 +561,7 @@ private: bool HandleCommandLineArguments(size_t& i, std::vector<std::string>& args, std::string& errormsg); - /** hande the -S -SP and -SR arguments */ + /** handle the -S -SP and -SR arguments */ void HandleScriptArguments(size_t& i, std::vector<std::string>& args, bool& SRArgumentSpecified); diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx index 72489bf..47636cd 100644 --- a/Source/cmExportBuildFileGenerator.cxx +++ b/Source/cmExportBuildFileGenerator.cxx @@ -151,7 +151,7 @@ void cmExportBuildFileGenerator::GenerateImportTargetsConfig( target, properties, missingTargets); } - // TOOD: PUBLIC_HEADER_LOCATION + // TODO: PUBLIC_HEADER_LOCATION // This should wait until the build feature propagation stuff // is done. Then this can be a propagated include directory. // this->GenerateImportProperty(config, te->HeaderGenerator, diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index 63d04a6..02686f3 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -347,7 +347,7 @@ void cmExportInstallFileGenerator::GenerateImportTargetsConfig( cmGeneratorExpression::InstallInterface, gtgt, properties, missingTargets); - // TOOD: PUBLIC_HEADER_LOCATION + // TODO: PUBLIC_HEADER_LOCATION // This should wait until the build feature propagation stuff // is done. Then this can be a propagated include directory. // this->GenerateImportProperty(config, te->HeaderGenerator, diff --git a/Source/cmExportInstallFileGenerator.h b/Source/cmExportInstallFileGenerator.h index ea607fb..cbd6507 100644 --- a/Source/cmExportInstallFileGenerator.h +++ b/Source/cmExportInstallFileGenerator.h @@ -41,7 +41,7 @@ public: files. */ cmExportInstallFileGenerator(cmInstallExportGenerator* iegen); - /** Get the per-config file generated for each configuraiton. This + /** Get the per-config file generated for each configuration. This maps from the configuration name to the file temporary location for installation. */ std::map<std::string, std::string> const& GetConfigImportFiles() diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 759094b..b636c73 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -337,7 +337,7 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile( xml.EndElement(); // Build // Collect all used source files in the project. - // Keep a list of C/C++ source files which might have an acompanying header + // Keep a list of C/C++ source files which might have an accompanying header // that should be looked for. typedef std::map<std::string, CbpUnit> all_files_map_t; all_files_map_t allFiles; diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index c7c780c..b76efb2 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -265,7 +265,7 @@ void cmExtraCodeLiteGenerator::CreateNewProjectFile( // Collect all used source files in the project // Sort them into two containers, one for C/C++ implementation files - // which may have an acompanying header, one for all other files + // which may have an accompanying header, one for all other files std::map<std::string, cmSourceFile*> cFiles; std::set<std::string> otherFiles; @@ -571,7 +571,7 @@ void cmExtraCodeLiteGenerator::CreateNewProjectFile( // Collect all used source files in the project // Sort them into two containers, one for C/C++ implementation files - // which may have an acompanying header, one for all other files + // which may have an accompanying header, one for all other files std::string projectType; std::map<std::string, cmSourceFile*> cFiles; diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx index 64108d7..fbaacfc 100644 --- a/Source/cmFindCommon.cxx +++ b/Source/cmFindCommon.cxx @@ -56,7 +56,7 @@ void cmFindCommon::InitializeSearchPathGroups() { std::vector<PathLabel>* labels; - // Define the varoius different groups of path types + // Define the various different groups of path types // All search paths labels = &this->PathGroupLabelMap[PathGroup::All]; @@ -71,7 +71,7 @@ void cmFindCommon::InitializeSearchPathGroups() // Define the search group order this->PathGroupOrder.push_back(PathGroup::All); - // Create the idividual labeld search paths + // Create the individual labeled search paths this->LabeledPaths.insert( std::make_pair(PathLabel::PackageRoot, cmSearchPath(this))); this->LabeledPaths.insert( diff --git a/Source/cmGeneratedFileStream.h b/Source/cmGeneratedFileStream.h index 2b8056f..48f93c5 100644 --- a/Source/cmGeneratedFileStream.h +++ b/Source/cmGeneratedFileStream.h @@ -109,7 +109,7 @@ public: /** * Close the output file. This should be used only with an open * stream. The temporary file is atomically renamed to the - * destionation file if the stream is still valid when this method + * destination file if the stream is still valid when this method * is called. */ bool Close(); diff --git a/Source/cmLinkLibrariesCommand.cxx b/Source/cmLinkLibrariesCommand.cxx index 708ec8c..13f6bae 100644 --- a/Source/cmLinkLibrariesCommand.cxx +++ b/Source/cmLinkLibrariesCommand.cxx @@ -13,7 +13,7 @@ bool cmLinkLibrariesCommand::InitialPass(std::vector<std::string> const& args, if (args.empty()) { return true; } - // add libraries, nothe that there is an optional prefix + // add libraries, note that there is an optional prefix // of debug and optimized than can be used for (std::vector<std::string>::const_iterator i = args.begin(); i != args.end(); ++i) { diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index bc72f1b..869ef1e 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -243,7 +243,7 @@ protected: cmGeneratorTarget* target, const char* filename = nullptr); - // Helper methods for dependeny updates. + // Helper methods for dependency updates. bool ScanDependencies( const char* targetDir, std::map<std::string, cmDepends::DependencyVector>& validDeps); diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 4390c86..c0a1b6b 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -333,7 +333,7 @@ public: static FileFormat GetFileFormat(const char* ext); /** Windows if this is true, the CreateProcess in RunCommand will - * not show new consol windows when running programs. + * not show new console windows when running programs. */ static void SetRunCommandHideConsole(bool v) { s_RunCommandHideConsole = v; } static bool GetRunCommandHideConsole() { return s_RunCommandHideConsole; } diff --git a/Tests/CPackComponentsForAll/CMakeLists.txt b/Tests/CPackComponentsForAll/CMakeLists.txt index f2e4fcd..e49138a 100644 --- a/Tests/CPackComponentsForAll/CMakeLists.txt +++ b/Tests/CPackComponentsForAll/CMakeLists.txt @@ -169,7 +169,7 @@ set(CPACK_RPM_RELOCATION_PATHS "${CMAKE_INSTALL_INCLUDEDIR}" set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT") # set some tags for NuGet packages -# 1. all in one pacakge +# 1. all in one package set(CPACK_NUGET_PACKAGE_TAGS "nuget" "unit" "test" "all-in-one") # 2. per component packages set(CPACK_NUGET_APPLICATIONS_PACKAGE_TAGS "nuget" "unit" "test" "applications") diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt index dbf806e..64f6dc8 100644 --- a/Tests/Complex/Library/CMakeLists.txt +++ b/Tests/Complex/Library/CMakeLists.txt @@ -48,7 +48,7 @@ add_library(CMakeTestCLibraryShared SHARED testConly.c) define_property( TARGET PROPERTY FOO BRIEF_DOCS "a test property" - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + FULL_DOCS "A simple test property that means nothing and is used for nothing" ) set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt index dbf806e..64f6dc8 100644 --- a/Tests/ComplexOneConfig/Library/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt @@ -48,7 +48,7 @@ add_library(CMakeTestCLibraryShared SHARED testConly.c) define_property( TARGET PROPERTY FOO BRIEF_DOCS "a test property" - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + FULL_DOCS "A simple test property that means nothing and is used for nothing" ) set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py index 90ddd36..b0c8f71 100644 --- a/Utilities/Sphinx/cmake.py +++ b/Utilities/Sphinx/cmake.py @@ -279,7 +279,7 @@ class CMakeXRefRole(XRefRole): # We cannot insert index nodes using the result_nodes method # because CMakeXRefRole is processed before substitution_reference # nodes are evaluated so target nodes (with 'ids' fields) would be - # duplicated in each evaluted substitution replacement. The + # duplicated in each evaluated substitution replacement. The # docutils substitution transform does not allow this. Instead we # use our own CMakeXRefTransform below to add index entries after # substitutions are completed. |