diff options
| author | Brad King <brad.king@kitware.com> | 2024-06-03 13:08:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-06-03 13:08:52 (GMT) |
| commit | d1cf2a2206fc86ef11a4553a890824f552362de5 (patch) | |
| tree | 511fd991016434197fc1139fbe05fd0ed9a59ce8 /Tests/RunCMake | |
| parent | 640a167d0360e6be10fbeadd80c5c28a14e3ea5c (diff) | |
| parent | 7c516f7e28813a1ed66a4fd0a94d8a56b611eeef (diff) | |
| download | CMake-d1cf2a2206fc86ef11a4553a890824f552362de5.zip CMake-d1cf2a2206fc86ef11a4553a890824f552362de5.tar.gz CMake-d1cf2a2206fc86ef11a4553a890824f552362de5.tar.bz2 | |
Merge topic 'file-accept-empty-lists'
7c516f7e28 file(): TOUCH, TOUCH_NOCREATE and MAKE_DIRECTORY accept empty lists
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9570
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/file/LOCK-error-no-path-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/file/TOUCH-result.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/file/TOUCH-stderr.txt | 9 | ||||
| -rw-r--r-- | Tests/RunCMake/file/TOUCH.cmake | 1 |
4 files changed, 2 insertions, 11 deletions
diff --git a/Tests/RunCMake/file/LOCK-error-no-path-stderr.txt b/Tests/RunCMake/file/LOCK-error-no-path-stderr.txt index 2247aa6..6d70016 100644 --- a/Tests/RunCMake/file/LOCK-error-no-path-stderr.txt +++ b/Tests/RunCMake/file/LOCK-error-no-path-stderr.txt @@ -1,4 +1,4 @@ CMake Error at LOCK-error-no-path.cmake:[0-9]+ \(file\): - file must be called with at least two arguments. + sub-command LOCK requires at least two arguments\. Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/file/TOUCH-result.txt b/Tests/RunCMake/file/TOUCH-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/file/TOUCH-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/file/TOUCH-stderr.txt b/Tests/RunCMake/file/TOUCH-stderr.txt deleted file mode 100644 index 9f31676..0000000 --- a/Tests/RunCMake/file/TOUCH-stderr.txt +++ /dev/null @@ -1,9 +0,0 @@ -^CMake Error at TOUCH\.cmake:[0-9]+ \(file\): - file must be called with at least two arguments\. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) -+ -CMake Error at TOUCH\.cmake:[0-9]+ \(file\): - file must be called with at least two arguments\. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/file/TOUCH.cmake b/Tests/RunCMake/file/TOUCH.cmake index 8931eb5..c92a962 100644 --- a/Tests/RunCMake/file/TOUCH.cmake +++ b/Tests/RunCMake/file/TOUCH.cmake @@ -12,5 +12,6 @@ if(NOT EXISTS "${file}") endif() file(REMOVE "${file}") +# Empty arguments used to be an error, but this is valid since CMake 3.30 file(TOUCH) file(TOUCH_NOCREATE) |