diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-26 13:48:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-10-26 13:48:28 (GMT) |
| commit | f01576012f17d5552bc37d8f436ef7e3b47b3a86 (patch) | |
| tree | fdffb28c389671a0a886a938a8f8dae1dd57c115 | |
| parent | a720131006d81f8c10783ac12e4ef172d5e2d690 (diff) | |
| parent | a1b1f1a282b7d5b811ac15e2ae823d0db23fe70f (diff) | |
| download | CMake-f01576012f17d5552bc37d8f436ef7e3b47b3a86.zip CMake-f01576012f17d5552bc37d8f436ef7e3b47b3a86.tar.gz CMake-f01576012f17d5552bc37d8f436ef7e3b47b3a86.tar.bz2 | |
Merge branch 'cmp0040-wording' into release-3.10
Merge-request: !1415
| -rw-r--r-- | Help/policy/CMP0040.rst | 2 | ||||
| -rw-r--r-- | Source/cmPolicies.h | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target-stderr.txt | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Help/policy/CMP0040.rst b/Help/policy/CMP0040.rst index d46baf6..0afe589 100644 --- a/Help/policy/CMP0040.rst +++ b/Help/policy/CMP0040.rst @@ -2,7 +2,7 @@ CMP0040 ------- The target in the ``TARGET`` signature of :command:`add_custom_command` -must exist and must be defined in current directory. +must exist and must be defined in the current directory. CMake 2.8.12 and lower silently ignored a custom command created with the ``TARGET`` signature of :command:`add_custom_command` diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index 354011a..6c33e2b 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -126,7 +126,7 @@ class cmMakefile; 3, 0, 0, cmPolicies::WARN) \ SELECT(POLICY, CMP0040, \ "The target in the TARGET signature of add_custom_command() must " \ - "exist.", \ + "exist and must be defined in the current directory.", \ 3, 0, 0, cmPolicies::WARN) \ SELECT(POLICY, CMP0041, \ "Error on relative include with generator expression.", 3, 0, 0, \ diff --git a/Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target-stderr.txt index e3e3ff4..70ed05b 100644 --- a/Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target-stderr.txt +++ b/Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target-stderr.txt @@ -1,8 +1,8 @@ CMake Warning \(dev\) at CMP0040-WARN-missing-target.cmake:2 \(add_custom_command\): Policy CMP0040 is not set: The target in the TARGET signature of - add_custom_command\(\) must exist. Run "cmake --help-policy CMP0040" for - policy details. Use the cmake_policy command to set the policy and - suppress this warning. + add_custom_command\(\) must exist and must be defined in the current + directory. Run "cmake --help-policy CMP0040" for policy details. Use the + cmake_policy command to set the policy and suppress this warning. + No TARGET 'foobar' has been created in this directory. Call Stack \(most recent call first\): |