summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-01-30 13:43:21 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2017-01-30 13:43:21 (GMT)
commit5c6c766da1b30f2d886ba369a4c407e575ee1ccf (patch)
treebf001e4a08efd08516a0756736d8ccd98e4c9009 /Source
parente6659f6323c75331f15fe93bb8d060ec03729738 (diff)
parent6c54f7b3655737406c53fa1e4fc1d8f4cc22f9f9 (diff)
downloadCMake-5c6c766da1b30f2d886ba369a4c407e575ee1ccf.zip
CMake-5c6c766da1b30f2d886ba369a4c407e575ee1ccf.tar.gz
CMake-5c6c766da1b30f2d886ba369a4c407e575ee1ccf.tar.bz2
Merge topic 'timestamp-percent'
6c54f7b3 string: Teach TIMESTAMP to treat %% as %
Diffstat (limited to 'Source')
-rw-r--r--Source/cmTimestamp.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 1e5ac5b..3d42e26 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -136,6 +136,7 @@ std::string cmTimestamp::AddTimestampComponent(char flag,
case 'w':
case 'y':
case 'Y':
+ case '%':
break;
case 's': // Seconds since UNIX epoch (midnight 1-jan-1970)
{