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 846d838c55836073bb97d4589a20885af9328079 (commit) via 3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f (commit) from e17e6c2fe24f89c5fab89484bb3d37558eec949f (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=846d838c55836073bb97d4589a20885af9328079 commit 846d838c55836073bb97d4589a20885af9328079 Merge: e17e6c2 3cd2e0e Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Oct 20 11:15:04 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Oct 20 11:15:04 2015 -0400 Merge topic 'fix_delphi_coverage' into next 3cd2e0e2 Tests: Fix DelphiCoverage test file selection https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f commit 3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f Author: Joseph Snyder <joe.sny...@kitware.com> AuthorDate: Wed Aug 13 18:03:53 2014 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Oct 20 11:13:25 2015 -0400 Tests: Fix DelphiCoverage test file selection 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: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits