[Cmake-commits] CMake branch, next, updated. v2.8.6-2111-gde3cd51
David Cole
david.cole at kitware.com
Mon Dec 5 11:51:23 EST 2011
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 de3cd51e3546648a7375173301500db44f2b2098 (commit)
via f529ddcea0228e6919ef09af8d7d8afa7f1e7c19 (commit)
via e0bc42aa4ff086e9c6976ab91ba924530df0bf72 (commit)
via e21e5cf289b79b7c260c93a19c52b63810a0efa3 (commit)
from e140831177071b15d0e8aa6023604b2e1926df03 (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=de3cd51e3546648a7375173301500db44f2b2098
commit de3cd51e3546648a7375173301500db44f2b2098
Merge: e140831 f529ddc
Author: David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 5 11:51:22 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 5 11:51:22 2011 -0500
Merge topic 'fix-ExternalProject-svn-issue' into next
f529ddc Tests: ExternalProject: Remove unnecessary 'svn --version' call
e0bc42a KWSys Nightly Date Stamp
e21e5cf KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f529ddcea0228e6919ef09af8d7d8afa7f1e7c19
commit f529ddcea0228e6919ef09af8d7d8afa7f1e7c19
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Nov 1 18:38:52 2011 +0100
Commit: David Cole <david.cole at kitware.com>
CommitDate: Mon Dec 5 11:49:31 2011 -0500
Tests: ExternalProject: Remove unnecessary 'svn --version' call
This test will fail to get a proper version number if running on a (e.g.
German) localized system because the regular expression used to match the
Subversion version output does not match. Instead of duplicating code just
remove the local test altogether and use the version that FindSubversion.cmake
already detects.
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index 4a542d7..ac70129 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -343,13 +343,6 @@ endif()
# Only do svn tests with svn >= version 1.2
#
if(do_svn_tests)
- execute_process(COMMAND ${Subversion_SVN_EXECUTABLE} --version
- OUTPUT_VARIABLE Subversion_VERSION_SVN
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*"
- "\\2" Subversion_VERSION_SVN "${Subversion_VERSION_SVN}")
- message(STATUS "Subversion_VERSION_SVN='${Subversion_VERSION_SVN}'")
-
if(Subversion_VERSION_SVN VERSION_LESS 1.2)
message(STATUS "No ExternalProject svn tests with svn client less than version 1.2")
set(do_svn_tests 0)
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/kwsysDateStamp.cmake | 2 +-
Tests/ExternalProject/CMakeLists.txt | 7 -------
2 files changed, 1 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list