diff options
| author | Brad King <brad.king@kitware.com> | 2009-10-02 18:36:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-10-02 18:36:47 (GMT) |
| commit | 3d3efbd3f50cf1acbbda1a8d07d53874f2388842 (patch) | |
| tree | beb6ebc6f5920b0b240a87897a67edb40df2fd47 /Source | |
| parent | 5837f4a613254ac578b957405a0af87a9473a676 (diff) | |
| download | CMake-3d3efbd3f50cf1acbbda1a8d07d53874f2388842.zip CMake-3d3efbd3f50cf1acbbda1a8d07d53874f2388842.tar.gz CMake-3d3efbd3f50cf1acbbda1a8d07d53874f2388842.tar.bz2 | |
Clarify documentation and message for CMP0012
This commit re-words the warning message produced for CMP0012 to avoid
the word 'you' since often the person reading the message is not the
author of the code. We also add an example of the bad OLD behavior to
the policy documentation.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmIfCommand.cxx | 10 | ||||
| -rw-r--r-- | Source/cmPolicies.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index 81be212..b51fabb 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -269,10 +269,9 @@ namespace if (cmSystemTools::IsOff(def)) { cmPolicies* policies = makefile->GetPolicies(); - errorString = "You have used a variable or argument named \"" + errorString = "A variable or argument named \"" + newArg - + "\" in a conditional statement. Please be aware of issues " - + "related to policy CMP0012. " + + "\" appears in a conditional statement. " + policies->GetPolicyWarning(cmPolicies::CMP0012); status = cmake::AUTHOR_WARNING; } @@ -285,10 +284,9 @@ namespace if (!cmSystemTools::IsOff(def)) { cmPolicies* policies = makefile->GetPolicies(); - errorString = "You have used a variable or argument named \"" + errorString = "A variable or argument named \"" + newArg - + "\" in a conditional statement. Please be aware of issues " - + "related to policy CMP0012. " + + "\" appears in a conditional statement. " + policies->GetPolicyWarning(cmPolicies::CMP0012); status = cmake::AUTHOR_WARNING; } diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index b6bb116..a7292cf 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -362,7 +362,9 @@ cmPolicies::cmPolicies() "In CMake versions 2.6.4 and lower the only boolean constants were 0 " "and 1. Other boolean constants such as true, false, yes, no, " "on, off, y, n, notfound, ignore (all case insensitive) were recognized " - "in some cases but not all. In later versions of cmake these values are " + "in some cases but not all. " + "For example, the code \"if(TRUE)\" might have evaluated as false. " + "In later versions of cmake these values are " "treated as boolean constants more consistently and should not be used " "as variable names. " "The OLD behavior for this policy is to allow variables to have names " |