summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-13 15:40:47 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-09-13 15:40:47 (GMT)
commit994e98bf415183a6b360f05a43cedf53778e5a7a (patch)
tree5248ea7bc129bc721f24fc4230f1defcf97c42cf /Help
parentf51f4ee9a34faeeb6ed22ea4e894dbac7572abc7 (diff)
parent410add400803340581eccf5ac1c83c8d4e40ad5a (diff)
downloadCMake-994e98bf415183a6b360f05a43cedf53778e5a7a.zip
CMake-994e98bf415183a6b360f05a43cedf53778e5a7a.tar.gz
CMake-994e98bf415183a6b360f05a43cedf53778e5a7a.tar.bz2
Merge topic 'timestamp-names'
410add40 Help: Add notes for topic 'timestamp-names' 751f7b52 string(TIMESTAMP ...): add '%a' and '%b' format specifiers
Diffstat (limited to 'Help')
-rw-r--r--Help/command/string.rst2
-rw-r--r--Help/release/dev/timestamp-names.rst6
2 files changed, 8 insertions, 0 deletions
diff --git a/Help/command/string.rst b/Help/command/string.rst
index 19a095a..8028333 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -278,12 +278,14 @@ specifiers:
%I The hour on a 12-hour clock (01-12).
%j The day of the current year (001-366).
%m The month of the current year (01-12).
+ %b Abbreviated month name (e.g. Oct).
%M The minute of the current hour (00-59).
%s Seconds since midnight (UTC) 1-Jan-1970 (UNIX time).
%S The second of the current minute.
60 represents a leap second. (00-60)
%U The week number of the current year (00-53).
%w The day of the current week. 0 is Sunday. (0-6)
+ %a Abbreviated weekday name (e.g. Fri).
%y The last two digits of the current year (00-99)
%Y The current year.
diff --git a/Help/release/dev/timestamp-names.rst b/Help/release/dev/timestamp-names.rst
new file mode 100644
index 0000000..ea54b5c
--- /dev/null
+++ b/Help/release/dev/timestamp-names.rst
@@ -0,0 +1,6 @@
+timestamp-names
+---------------
+
+* The :command:`string(TIMESTAMP)` and :command:`file(TIMESTAMP)`
+ commands gained support for the ``%a`` and ``%b`` placeholders.
+ These are the abbreviated weekday and month names.