[Cmake-commits] CMake branch, next, updated. v2.8.3-1175-gfeb9dbb
Brad King
brad.king at kitware.com
Tue Jan 4 08:25:22 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 feb9dbb5541ca055dec8fdb641acb2eb7b41511b (commit)
via 5990eda78f3db1ed7dae3b08935907763c6189e1 (commit)
from 26ec6c178fe1d6a83aad93e04de78321545cd108 (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=feb9dbb5541ca055dec8fdb641acb2eb7b41511b
commit feb9dbb5541ca055dec8fdb641acb2eb7b41511b
Merge: 26ec6c1 5990eda
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 4 08:25:15 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 4 08:25:15 2011 -0500
Merge topic 'issue_10201' into next
5990eda Revert "Added macro Subversion_WC_UPDATE([path...])."
diff --cc Modules/FindSubversion.cmake
index 9fd2fdc,daf3d87..11f66b0
--- a/Modules/FindSubversion.cmake
+++ b/Modules/FindSubversion.cmake
@@@ -132,37 -113,9 +120,9 @@@ IF(Subversion_SVN_EXECUTABLE
ENDIF(NOT ${Subversion_svn_log_result} EQUAL 0)
ENDMACRO(Subversion_WC_LOG)
- MACRO(Subversion_WC_UPDATE)
- # This macro requires network access to the svn server and could be slow.
- SET(_svn_update ${Subversion_SVN_EXECUTABLE} --non-interactive update -q)
- FOREACH(_path ${ARGV})
- IF(NOT IS_ABSOLUTE ${_path})
- GET_FILENAME_COMPONENT(_path ${_path} ABSOLUTE)
- ENDIF(NOT IS_ABSOLUTE ${_path})
- STRING(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/" "" _dirs "${_path}")
- STRING(REPLACE "/" ";" _dirs "${_dirs}")
- SET(_wc ${CMAKE_SOURCE_DIR})
- FOREACH(_dir ${_dirs})
- SET(_wc ${_wc}/${_dir})
- IF("${_wc}" STREQUAL "${_path}")
- SET(_cmd ${_svn_update} "${_wc}")
- ELSE("${_wc}" STREQUAL "${_path}")
- SET(_cmd ${_svn_update} -N "${_wc}")
- ENDIF("${_wc}" STREQUAL "${_path}")
- EXECUTE_PROCESS(
- COMMAND ${_cmd}
- RESULT_VARIABLE _result
- ERROR_VARIABLE _error)
- IF(_result)
- MESSAGE(SEND_ERROR "${_cmd} failed:\n${_error}")
- ENDIF(_result)
- ENDFOREACH(_dir ${_dirs})
- ENDFOREACH(_path ${ARGV})
- ENDMACRO(Subversion_WC_UPDATE)
-
ENDIF(Subversion_SVN_EXECUTABLE)
-INCLUDE(FindPackageHandleStandardArgs)
+INCLUDE("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake")
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Subversion REQUIRED_VARS Subversion_SVN_EXECUTABLE
VERSION_VAR Subversion_VERSION_SVN )
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5990eda78f3db1ed7dae3b08935907763c6189e1
commit 5990eda78f3db1ed7dae3b08935907763c6189e1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 4 08:24:09 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 4 08:24:09 2011 -0500
Revert "Added macro Subversion_WC_UPDATE([path...])."
This reverts commit 83c31ae00af38d2c8b3396c7e13caa66489c2bd1.
Removing until Marcel has time to continue work on the feature.
diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake
index f218827..daf3d87 100644
--- a/Modules/FindSubversion.cmake
+++ b/Modules/FindSubversion.cmake
@@ -8,11 +8,9 @@
# The minimum required version of Subversion can be specified using the
# standard syntax, e.g. FIND_PACKAGE(Subversion 1.4)
#
-# If the command line client executable is found the following macros are
-# defined:
+# If the command line client executable is found two macros are defined:
# Subversion_WC_INFO(<dir> <var-prefix>)
# Subversion_WC_LOG(<dir> <var-prefix>)
-# Subversion_WC_UPDATE([path...])
# Subversion_WC_INFO extracts information of a subversion working copy at
# a given location. This macro defines the following variables:
# <var-prefix>_WC_URL - url of the repository (at <dir>)
@@ -26,12 +24,6 @@
# subversion working copy at a given location. This macro defines the
# variable:
# <var-prefix>_LAST_CHANGED_LOG - last log of base revision
-# Subversion_WC_UPDATE runs 'svn update' on each of the paths supplied as
-# argument. Each path will be converted to an absolute. This is necessary in
-# order to determine its position relative to the top-level source directory
-# CMAKE_SOURCE_DIR. If any intermediate directories are missing, they will be
-# 'svn update'-d non-recursively as well.
-#
# Example usage:
# FIND_PACKAGE(Subversion)
# IF(SUBVERSION_FOUND)
@@ -39,10 +31,6 @@
# MESSAGE("Current revision is ${Project_WC_REVISION}")
# Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)
# MESSAGE("Last changed log is ${Project_LAST_CHANGED_LOG}")
-# Subversion_WC_UPDATE(${PROJECT_SOURCE_DIR})
-# MESSAGE("Updated my working copy")
-# Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
-# MESSAGE("Revision after update is ${Project_WC_REVISION}")
# ENDIF(SUBVERSION_FOUND)
#=============================================================================
@@ -125,34 +113,6 @@ IF(Subversion_SVN_EXECUTABLE)
ENDIF(NOT ${Subversion_svn_log_result} EQUAL 0)
ENDMACRO(Subversion_WC_LOG)
- MACRO(Subversion_WC_UPDATE)
- # This macro requires network access to the svn server and could be slow.
- SET(_svn_update ${Subversion_SVN_EXECUTABLE} --non-interactive update -q)
- FOREACH(_path ${ARGV})
- IF(NOT IS_ABSOLUTE ${_path})
- GET_FILENAME_COMPONENT(_path ${_path} ABSOLUTE)
- ENDIF(NOT IS_ABSOLUTE ${_path})
- STRING(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/" "" _dirs "${_path}")
- STRING(REPLACE "/" ";" _dirs "${_dirs}")
- SET(_wc ${CMAKE_SOURCE_DIR})
- FOREACH(_dir ${_dirs})
- SET(_wc ${_wc}/${_dir})
- IF("${_wc}" STREQUAL "${_path}")
- SET(_cmd ${_svn_update} "${_wc}")
- ELSE("${_wc}" STREQUAL "${_path}")
- SET(_cmd ${_svn_update} -N "${_wc}")
- ENDIF("${_wc}" STREQUAL "${_path}")
- EXECUTE_PROCESS(
- COMMAND ${_cmd}
- RESULT_VARIABLE _result
- ERROR_VARIABLE _error)
- IF(_result)
- MESSAGE(SEND_ERROR "${_cmd} failed:\n${_error}")
- ENDIF(_result)
- ENDFOREACH(_dir ${_dirs})
- ENDFOREACH(_path ${ARGV})
- ENDMACRO(Subversion_WC_UPDATE)
-
ENDIF(Subversion_SVN_EXECUTABLE)
INCLUDE(FindPackageHandleStandardArgs)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindSubversion.cmake | 42 +-----------------------------------------
1 files changed, 1 insertions(+), 41 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list