diff options
author | Brad King <brad.king@kitware.com> | 2022-10-28 14:04:28 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-28 14:04:47 (GMT) |
commit | 94983f1d969f227c5343e291926a20599c0f5411 (patch) | |
tree | d27fd3eda159c210590966fba8f94cefc5f07ac2 /Help | |
parent | 3469d53b3f9ddabe067044ed2cac92215fbe825c (diff) | |
parent | 9da542d5c1c983b9ea608b7fc04d75826278564f (diff) | |
download | CMake-94983f1d969f227c5343e291926a20599c0f5411.zip CMake-94983f1d969f227c5343e291926a20599c0f5411.tar.gz CMake-94983f1d969f227c5343e291926a20599c0f5411.tar.bz2 |
Merge topic 'timestamp-timezone'
9da542d5c1 string(TIMESTAMP): Add %z and %Z for adding time zone string
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7788
Diffstat (limited to 'Help')
-rw-r--r-- | Help/command/string.rst | 11 | ||||
-rw-r--r-- | Help/release/dev/timestamp-timezone.rst | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Help/command/string.rst b/Help/command/string.rst index 86cbd2e..217157c 100644 --- a/Help/command/string.rst +++ b/Help/command/string.rst @@ -522,6 +522,17 @@ specifiers: ``%Y`` The current year. +``%z`` + .. versionadded:: 3.26 + + The offset of the time zone from UTC, in hours and minutes, + with format ``+hhmm`` or ``-hhmm``. + +``%Z`` + .. versionadded:: 3.26 + + The time zone name. + Unknown format specifiers will be ignored and copied to the output as-is. diff --git a/Help/release/dev/timestamp-timezone.rst b/Help/release/dev/timestamp-timezone.rst new file mode 100644 index 0000000..178fa9a --- /dev/null +++ b/Help/release/dev/timestamp-timezone.rst @@ -0,0 +1,5 @@ +timestamp-timezone +------------------ + +* The :command:`string(TIMESTAMP)` and :command:`file(TIMESTAMP)` commands + now support the ``%z`` and ``%Z`` specifiers for the time zone. |