diff options
| author | Craig Scott <craig.scott@crascit.com> | 2022-12-19 20:13:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-12-19 20:14:17 (GMT) |
| commit | a776857dc6f0ce45bb1ddd2ed37f544808b82273 (patch) | |
| tree | 02297ee7d4198202d25a9e71af8603f619d26afc | |
| parent | 06f58a802c9b2fbae15acf6a29e89bc75b4f6cc5 (diff) | |
| parent | a81794842346713962361d17c2f58fe1b382ab27 (diff) | |
| download | CMake-a776857dc6f0ce45bb1ddd2ed37f544808b82273.zip CMake-a776857dc6f0ce45bb1ddd2ed37f544808b82273.tar.gz CMake-a776857dc6f0ce45bb1ddd2ed37f544808b82273.tar.bz2 | |
Merge topic 'code-comment-typos' into release-3.25
a817948423 Code comments: Fix trivial typos
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8030
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 044f69f..6cfdf62 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -368,7 +368,7 @@ cmComputeLinkInformation::cmComputeLinkInformation( LibraryFeatureDescriptor{ "__CMAKE_LINK_EXECUTABLE", cmStrCat(this->LoaderFlag, "<LIBRARY>") }); } - // To link framewortk using a full path + // To link framework using a full path this->LibraryFeatureDescriptors.emplace( "__CMAKE_LINK_FRAMEWORK", LibraryFeatureDescriptor{ "__CMAKE_LINK_FRAMEWORK", "<LIBRARY>" }); diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 89b2ea8..076b041 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -369,7 +369,7 @@ public: that is a framework. */ bool NameResolvesToFramework(const std::string& libname) const; /** Split a framework path to the directory and name of the framework as well - * as optiona; suffix. + * as optional suffix. * Returns std::nullopt if the path does not match with framework format * when extendedFormat is true, required format is relaxed (i.e. extension * `.framework' is optional). Used when FRAMEWORK link feature is |