diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-30 13:43:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-30 13:43:21 (GMT) |
| commit | 5c6c766da1b30f2d886ba369a4c407e575ee1ccf (patch) | |
| tree | bf001e4a08efd08516a0756736d8ccd98e4c9009 /Tests | |
| parent | e6659f6323c75331f15fe93bb8d060ec03729738 (diff) | |
| parent | 6c54f7b3655737406c53fa1e4fc1d8f4cc22f9f9 (diff) | |
| download | CMake-5c6c766da1b30f2d886ba369a4c407e575ee1ccf.zip CMake-5c6c766da1b30f2d886ba369a4c407e575ee1ccf.tar.gz CMake-5c6c766da1b30f2d886ba369a4c407e575ee1ccf.tar.bz2 | |
Merge topic 'timestamp-percent'
6c54f7b3 string: Teach TIMESTAMP to treat %% as %
Diffstat (limited to 'Tests')
| -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 c12b070..653974c 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 +RESULT=2005-08-07 23:19:49 Sun 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 1232300..d242039 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" UTC) +string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S %a %b %y day=%j wd=%w week=%U %%I=%I epoch=%s" UTC) message("RESULT=${RESULT}") |