diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-16 13:20:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-16 13:23:42 (GMT) |
| commit | b824fd5a2e5e2fa5baa31e4fc11a29b3d446c0d0 (patch) | |
| tree | b5f62a4f780f66135d1122ea95df4fef27da72a3 /Source | |
| parent | 284d52eedd3f65d2da3dd18530047dc36c878e58 (diff) | |
| parent | 06a9a3bdc3cde5f4bf766771815e95d8e5a8aa62 (diff) | |
| download | CMake-b824fd5a2e5e2fa5baa31e4fc11a29b3d446c0d0.zip CMake-b824fd5a2e5e2fa5baa31e4fc11a29b3d446c0d0.tar.gz CMake-b824fd5a2e5e2fa5baa31e4fc11a29b3d446c0d0.tar.bz2 | |
Merge topic 'file-configure-angle-brackets'
06a9a3bdc3 file(CONFIGURE): Allow angle brackets in content
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5379
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFileCommand.cxx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 4fe5901..cd440ad 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -2989,15 +2989,7 @@ bool HandleConfigureCommand(std::vector<std::string> const& args, std::string outputFile = cmSystemTools::CollapseFullPath( args[2], status.GetMakefile().GetCurrentBinaryDirectory()); - std::string::size_type pos = input.find_first_of("<>"); - if (pos != std::string::npos) { - status.SetError(cmStrCat("CONFIGURE called with CONTENT containing a \"", - input[pos], - "\". This character is not allowed.")); - return false; - } - - pos = outputFile.find_first_of("<>"); + std::string::size_type pos = outputFile.find_first_of("<>"); if (pos != std::string::npos) { status.SetError(cmStrCat("CONFIGURE called with OUTPUT containing a \"", outputFile[pos], |