summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2024-11-15 23:02:01 (GMT)
committerCraig Scott <craig.scott@crascit.com>2024-11-15 23:02:01 (GMT)
commit62586f236ca39563d82af282776296400b0d93bd (patch)
treee854f0b9c438a57da8bb64d74ea244307dc0af25 /Tests
parent0dffd052876ac5d44ca7ac1b39c8b79c2b8d3f1b (diff)
downloadCMake-62586f236ca39563d82af282776296400b0d93bd.zip
CMake-62586f236ca39563d82af282776296400b0d93bd.tar.gz
CMake-62586f236ca39563d82af282776296400b0d93bd.tar.bz2
CMP0175: Do not reject USES_TERMINAL for add_custom_command(TARGET)
Fixes: #26449
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/add_custom_command/CMP0175-NEW-stderr.txt2
-rw-r--r--Tests/RunCMake/add_custom_command/CMP0175-WARN-stderr.txt2
-rw-r--r--Tests/RunCMake/add_custom_command/CMP0175.cmake5
3 files changed, 5 insertions, 4 deletions
diff --git a/Tests/RunCMake/add_custom_command/CMP0175-NEW-stderr.txt b/Tests/RunCMake/add_custom_command/CMP0175-NEW-stderr.txt
index c356971..8b02f7c 100644
--- a/Tests/RunCMake/add_custom_command/CMP0175-NEW-stderr.txt
+++ b/Tests/RunCMake/add_custom_command/CMP0175-NEW-stderr.txt
@@ -9,7 +9,7 @@ Call Stack \(most recent call first\):
CMake Error at CMP0175\.cmake:[0-9]+ \(add_custom_command\):
The following keywords are not supported when using
- add_custom_command\(TARGET\): IMPLICIT_DEPENDS, USES_TERMINAL
+ add_custom_command\(TARGET\): IMPLICIT_DEPENDS
Call Stack \(most recent call first\):
CMP0175-NEW\.cmake:2 \(include\)
CMakeLists\.txt:3 \(include\)
diff --git a/Tests/RunCMake/add_custom_command/CMP0175-WARN-stderr.txt b/Tests/RunCMake/add_custom_command/CMP0175-WARN-stderr.txt
index f49dd73..23b989e 100644
--- a/Tests/RunCMake/add_custom_command/CMP0175-WARN-stderr.txt
+++ b/Tests/RunCMake/add_custom_command/CMP0175-WARN-stderr.txt
@@ -13,7 +13,7 @@ This warning is for project developers\. Use -Wno-dev to suppress it\.
CMake Warning \(dev\) at CMP0175\.cmake:[0-9]+ \(add_custom_command\):
The following keywords are not supported when using
- add_custom_command\(TARGET\): IMPLICIT_DEPENDS, USES_TERMINAL\.
+ add_custom_command\(TARGET\): IMPLICIT_DEPENDS\.
Policy CMP0175 is not set: add_custom_command\(\) rejects invalid arguments\.
Run "cmake --help-policy CMP0175" for policy details\. Use the cmake_policy
diff --git a/Tests/RunCMake/add_custom_command/CMP0175.cmake b/Tests/RunCMake/add_custom_command/CMP0175.cmake
index 0c20f4e..fa877e7 100644
--- a/Tests/RunCMake/add_custom_command/CMP0175.cmake
+++ b/Tests/RunCMake/add_custom_command/CMP0175.cmake
@@ -24,14 +24,15 @@ add_custom_command(TARGET main
#OUTPUT # Other checks will fail before the CMP0175 check
#OUTPUTS # Special case, not a documented keyword (used for deprecated form)
#SOURCE # Old signature, special handling makes it hard to check
- #USES_TERMINAL
)
add_custom_command(TARGET main
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E true
# Has to be tested separately due to separate check for clash with DEPFILE
IMPLICIT_DEPENDS valueDoesNotMatterHere
- # Has to be tested separately due to separate check for clash with JOB_POOL
+ # Has to be tested separately due to separate check for clash with JOB_POOL.
+ # This one is supported, but was erroneously rejected in the 3.31.0 release.
+ # We keep this here to verify the fix for that regression.
USES_TERMINAL NO
)