diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2015-08-11 07:52:51 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-08-11 13:40:25 (GMT) |
| commit | 48c6e7f2cfc95fc851cf9711d9588f3498e647c4 (patch) | |
| tree | fce5c62bf83cedaa39fb56577ebe9962ce7a8b0c | |
| parent | 422d3f68de6bfa5c3fad68d2b030f2a618a821a2 (diff) | |
| download | CMake-48c6e7f2cfc95fc851cf9711d9588f3498e647c4.zip CMake-48c6e7f2cfc95fc851cf9711d9588f3498e647c4.tar.gz CMake-48c6e7f2cfc95fc851cf9711d9588f3498e647c4.tar.bz2 | |
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.
| -rw-r--r-- | Modules/DartConfiguration.tcl.in | 1 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 5 |
2 files changed, 3 insertions, 3 deletions
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()); |