[Cmake-commits] CMake branch, next, updated. v3.0.0-3895-gd4238f8
Brad King
brad.king at kitware.com
Tue Jun 24 13:53:30 EDT 2014
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 d4238f82ee5ae3c1c58131aa001e41915f740c0e (commit)
via 65d8d04859bd31e9992d500a6fca59cdf53c9219 (commit)
from 46c5c81d73cf288c85b0027422c89b840bcdb54d (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=d4238f82ee5ae3c1c58131aa001e41915f740c0e
commit d4238f82ee5ae3c1c58131aa001e41915f740c0e
Merge: 46c5c81 65d8d04
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 24 13:53:29 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 24 13:53:29 2014 -0400
Merge topic 'update-cdash-location' into next
65d8d048 Tests: Fix CMAKE_TESTS_CDASH_SERVER parsing
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65d8d04859bd31e9992d500a6fca59cdf53c9219
commit 65d8d04859bd31e9992d500a6fca59cdf53c9219
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 24 13:53:27 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 24 13:54:17 2014 -0400
Tests: Fix CMAKE_TESTS_CDASH_SERVER parsing
Allow the value to end without a slash and have an empty server path
component. This is needed to match "http://open.cdash.org" correctly.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 075205e..cf7bd75 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2549,7 +2549,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
if (CMAKE_TESTS_CDASH_SERVER)
- set(regex "^([^:]+)://([^/]+)(/.*)$")
+ set(regex "^([^:]+)://([^/]+)(.*)$")
if ("${CMAKE_TESTS_CDASH_SERVER}" MATCHES "${regex}")
set(protocol "${CMAKE_MATCH_1}")
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list