summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-11-01 12:00:42 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-11-01 12:01:44 (GMT)
commit4857aec5d5bdee608d0e4fcf1a921de2a1c1b89c (patch)
treeaaf469ca9ea03885cfa0f25c16e02225be4dca8c
parentac1d19029119c32c67da555a892e9948b29eb067 (diff)
parent0987a399ec01813e16c0a2c86d481e2b8e2aab25 (diff)
downloadCMake-4857aec5d5bdee608d0e4fcf1a921de2a1c1b89c.zip
CMake-4857aec5d5bdee608d0e4fcf1a921de2a1c1b89c.tar.gz
CMake-4857aec5d5bdee608d0e4fcf1a921de2a1c1b89c.tar.bz2
Merge topic 'notes_timestamp'
0987a399 CTest: fix Time formatting in Notes.xml Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1428
-rw-r--r--Source/cmCTest.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 4ea1493..37ff901 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -12,6 +12,7 @@
#include "cmsys/String.hxx"
#include "cmsys/SystemInformation.hxx"
#include <algorithm>
+#include <cstdint>
#include <ctype.h>
#include <iostream>
#include <map>
@@ -1421,7 +1422,7 @@ int cmCTest::GenerateCTestNotesOutput(cmXMLWriter& xml,
std::string note_time = this->CurrentTime();
xml.StartElement("Note");
xml.Attribute("Name", file);
- xml.Element("Time", cmSystemTools::GetTime());
+ xml.Element("Time", static_cast<uint64_t>(cmSystemTools::GetTime()));
xml.Element("DateTime", note_time);
xml.StartElement("Text");
cmsys::ifstream ifs(file.c_str());