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 f89d71957b470b16631cd1d54f5478aea1008530 (commit)
via 2d4e6f4e1712472b6423efa3be8eddb8ff68c330 (commit)
from 770cf22f35ebcbc48afdeb1db41f9a93ffb5cc42 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f89d71957b470b16631cd1d54f5478aea1008530
commit f89d71957b470b16631cd1d54f5478aea1008530
Merge: 770cf22 2d4e6f4
Author: Joe Snyder <joe.sny...@kitware.com>
AuthorDate: Mon Oct 19 10:46:07 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Oct 19 10:46:07 2015 -0400
Merge topic 'fix_delphi_coverage' into next
2d4e6f4e BUG: Switch Delphi Coverage Files
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d4e6f4e1712472b6423efa3be8eddb8ff68c330
commit 2d4e6f4e1712472b6423efa3be8eddb8ff68c330
Author: Joseph Snyder <joe.sny...@kitware.com>
AuthorDate: Wed Aug 13 18:03:53 2014 -0400
Commit: Joseph Snyder <joe.sny...@kitware.com>
CommitDate: Wed Aug 13 18:03:53 2014 -0400
BUG: Switch Delphi Coverage Files
The HTML file for the Delphi Code coverage was being found by the Dashboard
coverage run of CMake itself. Switch it to be a configured file to
eliminate this extra reading.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3f28c25..ae61bca 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2587,8 +2587,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
"${CMake_BINARY_DIR}/Testing/DelphiCoverage/DartConfiguration.tcl")
file(COPY "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/src"
DESTINATION "${CMake_BINARY_DIR}/Testing/DelphiCoverage")
- file(COPY
"${CMake_SOURCE_DIR}/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html"
- DESTINATION "${CMake_BINARY_DIR}/Testing/DelphiCoverage")
+ configure_file(
+ "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in"
+ "${CMake_BINARY_DIR}/Testing/DelphiCoverage/UTCovTest(UTCovTest.pas).html")
add_test(NAME CTestDelphiCoverage
COMMAND cmake -E chdir
${CMake_BINARY_DIR}/Testing/DelphiCoverage
diff --git a/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html
b/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in
similarity index 100%
rename from Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html
rename to Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 5 +++--
...vTest(UTCovTest.pas).html => UTCovTest(UTCovTest.pas).html.in} | 0
2 files changed, 3 insertions(+), 2 deletions(-)
rename Tests/DelphiCoverage/{UTCovTest(UTCovTest.pas).html =>
UTCovTest(UTCovTest.pas).html.in} (100%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
