diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-29 13:31:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-29 13:32:09 (GMT) |
| commit | d212d91f14d2f2ed4f77ea7f190bbea2a4f6e302 (patch) | |
| tree | 2d9709bb02f3a65a2155110210c3321f80fe31b6 /Source | |
| parent | 99dd2a6e159cc72cd76809d22abd13d07c99e849 (diff) | |
| parent | 769ff05483fa92e63466839854c4f3f0142a4fb3 (diff) | |
| download | CMake-d212d91f14d2f2ed4f77ea7f190bbea2a4f6e302.zip CMake-d212d91f14d2f2ed4f77ea7f190bbea2a4f6e302.tar.gz CMake-d212d91f14d2f2ed4f77ea7f190bbea2a4f6e302.tar.bz2 | |
Merge topic 'commands-file-permissions' into release-3.20
769ff05483 Help: Clarify permission-related command options
900184616a Cleanup: Fix misspelt name of local C++ variable
635431a0c9 Tests: Check host platform instead of target for running stat
4ceb0ca59e Tests: Remove redundant files for configure_file() tests
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5945
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmConfigureFileCommand.cxx | 14 | ||||
| -rw-r--r-- | Source/cmFileCommand.cxx | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/Source/cmConfigureFileCommand.cxx b/Source/cmConfigureFileCommand.cxx index edd261d..12b2925 100644 --- a/Source/cmConfigureFileCommand.cxx +++ b/Source/cmConfigureFileCommand.cxx @@ -165,7 +165,7 @@ bool cmConfigureFileCommand(std::vector<std::string> const& args, return false; } - mode_t permisiions = 0; + mode_t permissions = 0; if (filePermissions) { if (filePermissionOptions.empty()) { @@ -175,7 +175,7 @@ bool cmConfigureFileCommand(std::vector<std::string> const& args, std::vector<std::string> invalidOptions; for (auto const& e : filePermissionOptions) { - if (!cmFSPermissions::stringToModeT(e, permisiions)) { + if (!cmFSPermissions::stringToModeT(e, permissions)) { invalidOptions.push_back(e); } } @@ -197,14 +197,14 @@ bool cmConfigureFileCommand(std::vector<std::string> const& args, } if (noSourcePermissions) { - permisiions |= cmFSPermissions::mode_owner_read; - permisiions |= cmFSPermissions::mode_owner_write; - permisiions |= cmFSPermissions::mode_group_read; - permisiions |= cmFSPermissions::mode_world_read; + permissions |= cmFSPermissions::mode_owner_read; + permissions |= cmFSPermissions::mode_owner_write; + permissions |= cmFSPermissions::mode_group_read; + permissions |= cmFSPermissions::mode_world_read; } if (!status.GetMakefile().ConfigureFile(inputFile, outputFile, copyOnly, - atOnly, escapeQuotes, permisiions, + atOnly, escapeQuotes, permissions, newLineStyle)) { status.SetError("Problem configuring file"); return false; diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index f674833..4a28238 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -2446,18 +2446,18 @@ bool HandleGenerateCommand(std::vector<std::string> const& args, } } - mode_t permisiions = 0; + mode_t permissions = 0; if (arguments.NoSourcePermissions) { - permisiions |= cmFSPermissions::mode_owner_read; - permisiions |= cmFSPermissions::mode_owner_write; - permisiions |= cmFSPermissions::mode_group_read; - permisiions |= cmFSPermissions::mode_world_read; + permissions |= cmFSPermissions::mode_owner_read; + permissions |= cmFSPermissions::mode_owner_write; + permissions |= cmFSPermissions::mode_group_read; + permissions |= cmFSPermissions::mode_world_read; } if (!arguments.FilePermissions.empty()) { std::vector<std::string> invalidOptions; for (auto const& e : arguments.FilePermissions) { - if (!cmFSPermissions::stringToModeT(e, permisiions)) { + if (!cmFSPermissions::stringToModeT(e, permissions)) { invalidOptions.push_back(e); } } @@ -2479,7 +2479,7 @@ bool HandleGenerateCommand(std::vector<std::string> const& args, AddEvaluationFile(input, arguments.Target, arguments.Output, arguments.Condition, inputIsContent, - newLineStyle.GetCharacters(), permisiions, status); + newLineStyle.GetCharacters(), permissions, status); return true; } |