summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-12-31 14:57:25 (GMT)
committerBrad King <brad.king@kitware.com>2014-01-07 14:38:01 (GMT)
commit3917d86b261f0b88eb5cf0e8d2700c70cebdbe4b (patch)
treeb870364a3fec0acba6eb8c320f665ed181281535 /Help
parent5169130539110ff479875e76784109f174c28c69 (diff)
downloadCMake-3917d86b261f0b88eb5cf0e8d2700c70cebdbe4b.zip
CMake-3917d86b261f0b88eb5cf0e8d2700c70cebdbe4b.tar.gz
CMake-3917d86b261f0b88eb5cf0e8d2700c70cebdbe4b.tar.bz2
Genex: Add a nullary form for CONFIG
This is consistent with other similar expressions such as PLATFORM_ID, and makes the CONFIGURATION expression obsolete. Fix an off-by-one error in GeneratorExpressionContent::EvaluateParameters exposed by a unit test. Remove the test for 'bad' nullary use of $<CONFIG>. Add a unit test to verify that $<CONFIG> and $<CONFIGURATION> have the same value.
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-generator-expressions.7.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index 12cfaf8..ac8c3f8 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -104,6 +104,8 @@ expands to ``OLD_COMPILER`` if the
than 4.2.0.
``$<CONFIGURATION>``
+ Configuration name. Deprecated. Use ``CONFIG`` instead.
+``$<CONFIG>``
Configuration name
``$<PLATFORM_ID>``
The CMake-id of the platform