diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-11 11:49:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-11 11:49:40 (GMT) |
| commit | bf19bb5609b409c9c4043b22a7bbdb38354af73a (patch) | |
| tree | b0adea156126908463528e46815d3d38b798fe02 /Tests/RunCMake | |
| parent | 15b26ace186f08625337d59328ce5d7190cd5384 (diff) | |
| parent | 014ad2989cb145586d6d32d90710a70fb9a23ad9 (diff) | |
| download | CMake-bf19bb5609b409c9c4043b22a7bbdb38354af73a.zip CMake-bf19bb5609b409c9c4043b22a7bbdb38354af73a.tar.gz CMake-bf19bb5609b409c9c4043b22a7bbdb38354af73a.tar.bz2 | |
Merge topic 'timestamp'
014ad298 Timestamp: support %A and %B
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1228
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/string/Timestamp-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/string/Timestamp.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/string/Timestamp-stderr.txt b/Tests/RunCMake/string/Timestamp-stderr.txt index 653974c..cd4dcb3 100644 --- a/Tests/RunCMake/string/Timestamp-stderr.txt +++ b/Tests/RunCMake/string/Timestamp-stderr.txt @@ -1 +1 @@ -RESULT=2005-08-07 23:19:49 Sun Aug 05 day=219 wd=0 week=32 %I=11 epoch=1123456789 +RESULT=2005-08-07 23:19:49 Sunday=Sun August=Aug 05 day=219 wd=0 week=32 %I=11 epoch=1123456789 diff --git a/Tests/RunCMake/string/Timestamp.cmake b/Tests/RunCMake/string/Timestamp.cmake index d242039..cba258d 100644 --- a/Tests/RunCMake/string/Timestamp.cmake +++ b/Tests/RunCMake/string/Timestamp.cmake @@ -1,3 +1,3 @@ set(ENV{SOURCE_DATE_EPOCH} "1123456789") -string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S %a %b %y day=%j wd=%w week=%U %%I=%I epoch=%s" UTC) +string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S %A=%a %B=%b %y day=%j wd=%w week=%U %%I=%I epoch=%s" UTC) message("RESULT=${RESULT}") |