[Cmake-commits] CMake branch, next, updated. v2.8.2-391-gef94a10

[Brad King]

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  ef94a10b96fc0a571e2ade9d8452a96f31707d4e (commit)
       via  430336c5e1ae90903e3db228594b1c365c26f4a3 (commit)
      from  1ca959f67ac5d6187b7df01984c8a96a2551afe2 (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=ef94a10b96fc0a571e2ade9d8452a96f31707d4e
commit ef94a10b96fc0a571e2ade9d8452a96f31707d4e
Merge: 1ca959f 430336c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 10 14:51:04 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 10 14:51:04 2010 -0400

    Merge topic 'ImprovedVersionCheckingInSomeModules' into next
    
    430336c Merge branch 'findsubversion_fphsa_cleanup'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=430336c5e1ae90903e3db228594b1c365c26f4a3
commit 430336c5e1ae90903e3db228594b1c365c26f4a3
Merge: b6c6156 a918bd5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 10 14:50:00 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 10 14:50:00 2010 -0400

    Merge branch 'findsubversion_fphsa_cleanup'
    
    into ImprovedVersionCheckingInSomeModules
    
    Conflicts:
    	Modules/FindSubversion.cmake

diff --cc Modules/FindSubversion.cmake
index 30220d1,687aa19..14127ba
--- a/Modules/FindSubversion.cmake
+++ b/Modules/FindSubversion.cmake
@@@ -50,16 -43,7 +48,14 @@@ FIND_PROGRAM(Subversion_SVN_EXECUTABLE 
  MARK_AS_ADVANCED(Subversion_SVN_EXECUTABLE)
  
  IF(Subversion_SVN_EXECUTABLE)
-   SET(Subversion_SVN_FOUND TRUE)
  
 +  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}")
 +
- 
    MACRO(Subversion_WC_INFO dir prefix)
      # the subversion commands should be executed with the C locale, otherwise
      # the message (which are parsed) may be translated, Alex
@@@ -114,7 -105,8 +110,9 @@@
  ENDIF(Subversion_SVN_EXECUTABLE)
  
  INCLUDE(FindPackageHandleStandardArgs)
 -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Subversion DEFAULT_MSG Subversion_SVN_EXECUTABLE)
 +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Subversion REQUIRED_VARS Subversion_SVN_EXECUTABLE
 +                                             VERSION_VAR Subversion_VERSION_SVN )
  
+ # for compatibility
  SET(Subversion_FOUND ${SUBVERSION_FOUND})
+ SET(Subversion_SVN_FOUND ${SUBVERSION_FOUND})

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake