diff --git a/.codespellrc b/.codespellrc index 00c6c521a8..c227872db1 100644 --- a/.codespellrc +++ b/.codespellrc @@ -5,4 +5,4 @@ check-hidden = quiet-level = 2 builtin = clear,rare,en-GB_to_en-US skip = */.git,*/build,*/Copyright.txt,*/CTestCustom.cmake.in,*/doxygen.config,*/Modules/Internal/CPack/NSIS.template.in,*/Source/CursesDialog/form/*,*/Source/kwsys/*,*/Tests/RunCMake/CPack/tests/DMG_SLA/German.*,*/Tests/RunCMake/ParseImplicitData/*.input,*/Tests/StringFileTest/test.utf8,*.pfx,*/Utilities/cm* -ignore-words-list = aci,ags,ake,ans,ba,ccompiler,cconfiguration,certi,conly,dependees,dne,dum,earch,ect,filetest,fo,helpfull,hiden,isnt,keypair,nd,ned,nin,nknown,ot,pard,seh,ser,te,upto,varn,vas,wee +ignore-words-list = aci,ags,ake,ans,ba,ccompiler,cconfiguration,certi,conly,copyin,dependees,dne,dum,earch,ect,filetest,fo,helpfull,hiden,isnt,keypair,nd,ned,nin,nknown,ot,pard,sectionin,seh,ser,te,upto,varn,vas,wee diff --git a/Help/variable/CMAKE_FIND_PACKAGE_TARGETS_GLOBAL.rst b/Help/variable/CMAKE_FIND_PACKAGE_TARGETS_GLOBAL.rst index fc9b315e37..da603aa652 100644 --- a/Help/variable/CMAKE_FIND_PACKAGE_TARGETS_GLOBAL.rst +++ b/Help/variable/CMAKE_FIND_PACKAGE_TARGETS_GLOBAL.rst @@ -3,7 +3,7 @@ CMAKE_FIND_PACKAGE_TARGETS_GLOBAL .. versionadded:: 3.24 -Setting to ``TRUE`` promotes all :prop_tgt:`IMPORTED` targets discoverd +Setting to ``TRUE`` promotes all :prop_tgt:`IMPORTED` targets discovered by :command:`find_package` to a ``GLOBAL`` scope. diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 130b239e7f..73cac250d5 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -1093,7 +1093,7 @@ endif() # Set the CUDA_LIBRARIES variable. This is the set of stuff to link against if you are # using the CUDA runtime. For the dynamic version of the runtime, most of the -# dependencies are brough in, but for the static version there are additional libraries +# dependencies are brought in, but for the static version there are additional libraries # and linker commands needed. # Initialize to empty set(CUDA_LIBRARIES) @@ -1449,7 +1449,7 @@ function(CUDA_COMPUTE_BUILD_PATH path build_path) # Avoid spaces string(REPLACE " " "_" bpath "${bpath}") - # Strip off the filename. I wait until here to do it, since removin the + # Strip off the filename. I wait until here to do it, since removing the # basename can make a path that looked like path/../basename turn into # path/.. (notice the trailing slash). get_filename_component(bpath "${bpath}" PATH) diff --git a/Modules/Internal/CPack/CPackDeb.cmake b/Modules/Internal/CPack/CPackDeb.cmake index 98e6d18bce..0169f61adf 100644 --- a/Modules/Internal/CPack/CPackDeb.cmake +++ b/Modules/Internal/CPack/CPackDeb.cmake @@ -238,7 +238,7 @@ function(cpack_deb_prepare_package_vars) endforeach() # Only dynamically linked ELF files are included - # Extract only file name infront of ":" + # Extract only file name in front of ":" foreach(_FILE IN LISTS CPACK_DEB_INSTALL_FILES) if(_FILE MATCHES "ELF.*dynamically linked") string(REGEX MATCH "(^.*):" _FILE_NAME "${_FILE}") diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h index 8aa07e7342..7747750dcd 100644 --- a/Source/CTest/cmCTestScriptHandler.h +++ b/Source/CTest/cmCTestScriptHandler.h @@ -67,7 +67,7 @@ public: void AddConfigurationScript(const std::string&, bool pscope); /** - * Run a dashboard using a specified confiuration script + * Run a dashboard using a specified configuration script */ int ProcessHandler() override; diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index dd1bc598b6..c35af3fd89 100644 --- a/Source/CTest/cmCTestTestHandler.h +++ b/Source/CTest/cmCTestTestHandler.h @@ -65,7 +65,7 @@ public: */ void PopulateCustomVectors(cmMakefile* mf) override; - //! Control the use of the regular expresisons, call these methods to turn + //! Control the use of the regular expressions, call these methods to turn /// them on void UseIncludeRegExp(); void UseExcludeRegExp(); diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 918dc288fe..7f4e4ac779 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -4469,8 +4469,8 @@ static const struct ShellPathNode : public cmGeneratorExpressionNode const GeneratorExpressionContent* content, cmGeneratorExpressionDAGChecker* /*dagChecker*/) const override { - cmList listIn{ parameters.front() }; - if (listIn.empty()) { + cmList list_in{ parameters.front() }; + if (list_in.empty()) { reportError(context, content->GetOriginalExpression(), "\"\" is not an absolute path."); return std::string(); @@ -4478,17 +4478,17 @@ static const struct ShellPathNode : public cmGeneratorExpressionNode cmStateSnapshot snapshot = context->LG->GetStateSnapshot(); cmOutputConverter converter(snapshot); const char* separator = snapshot.GetState()->UseWindowsShell() ? ";" : ":"; - std::vector listOut; - listOut.reserve(listIn.size()); - for (auto const& in : listIn) { + std::vector list_out; + list_out.reserve(list_in.size()); + for (auto const& in : list_in) { if (!cmSystemTools::FileIsFullPath(in)) { reportError(context, content->GetOriginalExpression(), "\"" + in + "\" is not an absolute path."); return std::string(); } - listOut.emplace_back(converter.ConvertDirectorySeparatorsForShell(in)); + list_out.emplace_back(converter.ConvertDirectorySeparatorsForShell(in)); } - return cmJoin(listOut, separator); + return cmJoin(list_out, separator); } } shellPathNode; diff --git a/Templates/MSBuild/FlagTables/v142_CL.json b/Templates/MSBuild/FlagTables/v142_CL.json index 1d8a70695c..0566460bb9 100644 --- a/Templates/MSBuild/FlagTables/v142_CL.json +++ b/Templates/MSBuild/FlagTables/v142_CL.json @@ -1090,7 +1090,7 @@ { "name": "GenerateModuleDependencies", "switch": "sourceDependencies:directives", - "comment": "Generate Module Dependenices File", + "comment": "Generate Module Dependencies File", "value": "true", "flags": [ "Continue" diff --git a/Templates/MSBuild/FlagTables/v143_CL.json b/Templates/MSBuild/FlagTables/v143_CL.json index 9d6e2b020e..c5f94725e1 100644 --- a/Templates/MSBuild/FlagTables/v143_CL.json +++ b/Templates/MSBuild/FlagTables/v143_CL.json @@ -1092,7 +1092,7 @@ { "name": "GenerateModuleDependencies", "switch": "sourceDependencies:directives", - "comment": "Generate Module Dependenices File", + "comment": "Generate Module Dependencies File", "value": "true", "flags": [ "Continue" diff --git a/Tests/FortranModules/Submodules/obfuscated_parent.f90 b/Tests/FortranModules/Submodules/obfuscated_parent.f90 index f3e68be1e4..9368f16cdc 100644 --- a/Tests/FortranModules/Submodules/obfuscated_parent.f90 +++ b/Tests/FortranModules/Submodules/obfuscated_parent.f90 @@ -1,8 +1,8 @@ ! This module has two procedures from the "parent" module ! but it has different combinations 'module ' phrases -! in breaked lines for test of modules dependencies detection +! in broken lines for test of modules dependencies detection -! Module declaration on breaked line with reminder +! Module declaration on broken line with reminder module & obfuscated_parent; implicit none diff --git a/Tests/RunCMake/CPack/DEB/Helpers.cmake b/Tests/RunCMake/CPack/DEB/Helpers.cmake index 8904c696fe..39a316f426 100644 --- a/Tests/RunCMake/CPack/DEB/Helpers.cmake +++ b/Tests/RunCMake/CPack/DEB/Helpers.cmake @@ -101,7 +101,7 @@ function(getMissingShlibsErrorExtra FILE RESULT_VAR) string(APPEND error_extra "; readelf \"\n") # Only dynamically linked ELF files are included - # Extract only file name infront of ":" + # Extract only file name in front of ":" foreach(_FILE IN LISTS deb_install_files) if(_FILE MATCHES "ELF.*shared object") string(REGEX MATCH "(^.*):" _FILE_NAME "${_FILE}") diff --git a/Tests/RunCMake/CPack/README.txt b/Tests/RunCMake/CPack/README.txt index d403db0717..c63026e0d1 100644 --- a/Tests/RunCMake/CPack/README.txt +++ b/Tests/RunCMake/CPack/README.txt @@ -173,7 +173,7 @@ This phase is executed if '/VerifyResult.cmake' script exists. VerifyResult.cmake script also automatically prints out standard output and standard error from CPack execution phase that is compared with '/-stdout.txt' regular expression and -'/-stderr.txt' regular expresson respectively. +'/-stderr.txt' regular expression respectively. NOTE: For subtests generator name can also be suffixed with subtest name and/or packaging type (MONOLITHIC, COMPONENT, GROUP) and in such cases the preferences of which file will be used are as follows: diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stderr.txt b/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stderr.txt index 206ab21ca6..e9327a3c6e 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stderr.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stderr.txt @@ -1,2 +1,2 @@ Unable to find executable:.*MyThirdPartyDependency/src(/[^/ -]+)?/thirdparty +]+)?/third_party diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/CMakeLists.txt b/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/CMakeLists.txt index 2f57d555ad..6c86f76fb6 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/CMakeLists.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/CMakeLists.txt @@ -3,8 +3,8 @@ project(MyThirdPartyDependency) include(CTest) -add_executable(thirdparty thirdparty.c) -add_test(NAME thirdparty COMMAND thirdparty) +add_executable(third_party third_party.c) +add_test(NAME third_party COMMAND third_party) -set_property(TARGET thirdparty PROPERTY LABELS NotASubproject) -set_property(TEST thirdparty PROPERTY LABELS NotASubproject) +set_property(TARGET third_party PROPERTY LABELS NotASubproject) +set_property(TEST third_party PROPERTY LABELS NotASubproject) diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/thirdparty.c b/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/third_party.c similarity index 100% rename from Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/thirdparty.c rename to Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/third_party.c diff --git a/Utilities/Scripts/update-third-party.bash b/Utilities/Scripts/update-third-party.bash index bfe6828de9..cf76b17c9b 100644 --- a/Utilities/Scripts/update-third-party.bash +++ b/Utilities/Scripts/update-third-party.bash @@ -25,7 +25,7 @@ # ownership # A git author name/email for the commits. # subtree -# The location of the thirdparty package within the main source +# The location of the third-party package within the main source # tree. # repo # The git repository to use as upstream.