Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-15 20:46:37 +08:00
Code Issues Projects Releases Wiki Activity

file(CONFIGURE): Allow angle brackets in content

Browse Source 
Fixes: #21306
This commit is contained in:
Cristian Adam
2020-10-15 15:37:39 +02:00
parent 85c2bb724f
commit 06a9a3bdc3
7 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmFileCommand.cxx
View File

@@ -2945,15 +2945,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],

1
Tests/RunCMake/File_Configure/AngleBracketsContent-stderr.txt Normal file
View File

@@ -0,0 +1 @@
^foo-\$<CONFIG>$

6
Tests/RunCMake/File_Configure/AngleBracketsContent.cmake Normal file
View File

@@ -0,0 +1,6 @@
file(CONFIGURE
OUTPUT "file.txt"
CONTENT "foo-$<CONFIG>"
)
file(READ ${CMAKE_CURRENT_BINARY_DIR}/file.txt out)
message("${out}")

1
Tests/RunCMake/File_Configure/BadArgGeneratorExpressionContent-result.txt
View File

@@ -1 +0,0 @@
1

5
Tests/RunCMake/File_Configure/BadArgGeneratorExpressionContent-stderr.txt
View File

@@ -1,5 +0,0 @@
CMake Error at BadArgGeneratorExpressionContent.cmake:[0-9]+ \(file\):
file CONFIGURE called with CONTENT containing a "<". This character is not
allowed.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)

4
Tests/RunCMake/File_Configure/BadArgGeneratorExpressionContent.cmake
View File

@@ -1,4 +0,0 @@
file(CONFIGURE
OUTPUT "file.txt"
CONTENT "foo-$<CONFIG>"
)

2
Tests/RunCMake/File_Configure/RunCMakeTest.cmake
View File

@@ -1,7 +1,7 @@
include(RunCMake)
run_cmake(AngleBracketsContent)
run_cmake(BadArg)
run_cmake(BadArgGeneratorExpressionContent)
run_cmake(BadArgGeneratorExpressionOutput)
run_cmake(DirOutput)
run_cmake(NewLineStyle-NoArg)