[Cmake-commits] CMake branch, next, updated. v3.3.0-2141-gb0190e6
Brad King
brad.king at kitware.com
Tue Aug 11 09:43:10 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via b0190e6d2273999a93481ff0a03f38e94c05c6e2 (commit)
via 48c6e7f2cfc95fc851cf9711d9588f3498e647c4 (commit)
from b8f0363506ae5daa40f9635032dd3ba45c659cf6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0190e6d2273999a93481ff0a03f38e94c05c6e2
commit b0190e6d2273999a93481ff0a03f38e94c05c6e2
Merge: b8f0363 48c6e7f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 11 09:43:09 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 11 09:43:09 2015 -0400
Merge topic 'ctest-report-compiler-version' into next
48c6e7f2 CTest: Report to CDash the compiler version used to build the project
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48c6e7f2cfc95fc851cf9711d9588f3498e647c4
commit 48c6e7f2cfc95fc851cf9711d9588f3498e647c4
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Tue Aug 11 09:52:51 2015 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 11 09:40:25 2015 -0400
CTest: Report to CDash the compiler version used to build the project
The compiler version reported since commit v2.8.2~1018 (CTest-side
support for compiler name and compiler version, 2009-10-12) only
reported the version of the compiler used to build CMake, and only
if it defined "_COMPILER_VERSION". Instead use the version of
the compiler used to build the project CTest is testing.
diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in
index 918b407..2da8354 100644
--- a/Modules/DartConfiguration.tcl.in
+++ b/Modules/DartConfiguration.tcl.in
@@ -69,6 +69,7 @@ UpdateType: @UPDATE_TYPE@
# Compiler info
Compiler: @CMAKE_CXX_COMPILER@
+CompilerVersion: @CMAKE_CXX_COMPILER_VERSION@
# Dynamic analysis (MemCheck)
PurifyCommand: @PURIFYCOMMAND@
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index f65bd29..b976469 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1546,9 +1546,8 @@ void cmCTest::StartXML(cmXMLWriter& xml, bool append)
xml.Attribute("Append", "true");
}
xml.Attribute("CompilerName", this->GetCTestConfiguration("Compiler"));
-#ifdef _COMPILER_VERSION
- xml.Attribute("CompilerVersion", _COMPILER_VERSION);
-#endif
+ xml.Attribute("CompilerVersion",
+ this->GetCTestConfiguration("CompilerVersion"));
xml.Attribute("OSName", info.GetOSName());
xml.Attribute("Hostname", info.GetHostname());
xml.Attribute("OSRelease", info.GetOSRelease());
-----------------------------------------------------------------------
Summary of changes:
Modules/DartConfiguration.tcl.in | 1 +
Source/cmCTest.cxx | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list