diff options
| author | Brad King <brad.king@kitware.com> | 2013-09-18 18:05:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-09-20 12:20:01 (GMT) |
| commit | 027a0201b270e582d76c1de94a60c19a2a8e505c (patch) | |
| tree | bbc956f874a4656452e13319f8b2ac1ab0edc498 /Source/cmSetTestsPropertiesCommand.h | |
| parent | 33055c405ed3b0e1df52c186f0d8a3e878aa88a8 (diff) | |
| parent | 6a47c37ccf7049d5ac3fa6224def8d17ee82c7f5 (diff) | |
| download | CMake-027a0201b270e582d76c1de94a60c19a2a8e505c.zip CMake-027a0201b270e582d76c1de94a60c19a2a8e505c.tar.gz CMake-027a0201b270e582d76c1de94a60c19a2a8e505c.tar.bz2 | |
Merge branch 'test-property-genex' into generate-modern-style
Resolve conflict in Source/cmTestGenerator.cxx by taking "their" side
(test-property-genex). It already accounts for the lower-case change in
"our" side (generate-modern-style).
Diffstat (limited to 'Source/cmSetTestsPropertiesCommand.h')
| -rw-r--r-- | Source/cmSetTestsPropertiesCommand.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmSetTestsPropertiesCommand.h b/Source/cmSetTestsPropertiesCommand.h index 3a59218..f2f2611 100644 --- a/Source/cmSetTestsPropertiesCommand.h +++ b/Source/cmSetTestsPropertiesCommand.h @@ -51,7 +51,8 @@ public: " set_tests_properties(test1 [test2...] PROPERTIES prop1 value1 prop2" " value2)\n" "Set a property for the tests. If the property is not found, CMake " - "will report an error. The properties include:\n" + "will report an error. Generator expressions will be expanded the same " + "as supported by the test's add_test call. The properties include:\n" "WILL_FAIL: If set to true, this will invert the pass/fail flag of the" " test.\n" "PASS_REGULAR_EXPRESSION: If set, the test output will be checked " |