diff options
| author | Brad King <brad.king@kitware.com> | 2010-08-10 18:50:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-08-10 18:50:00 (GMT) |
| commit | 430336c5e1ae90903e3db228594b1c365c26f4a3 (patch) | |
| tree | a91eda6ff8215802e2951153e384834a41aee106 /Modules/FindSubversion.cmake | |
| parent | b6c61561d6cc646e4503b5e27ddd34944a0d6e11 (diff) | |
| parent | a918bd526453c4f4c92a3a1d6823fbd1b1b280ef (diff) | |
| download | CMake-430336c5e1ae90903e3db228594b1c365c26f4a3.zip CMake-430336c5e1ae90903e3db228594b1c365c26f4a3.tar.gz CMake-430336c5e1ae90903e3db228594b1c365c26f4a3.tar.bz2 | |
Merge branch 'findsubversion_fphsa_cleanup'
into ImprovedVersionCheckingInSomeModules
Conflicts:
Modules/FindSubversion.cmake
Diffstat (limited to 'Modules/FindSubversion.cmake')
| -rw-r--r-- | Modules/FindSubversion.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake index 30220d1..14127ba 100644 --- a/Modules/FindSubversion.cmake +++ b/Modules/FindSubversion.cmake @@ -43,14 +43,11 @@ # (To distributed this file outside of CMake, substitute the full # License text for the above reference.) -SET(Subversion_SVN_FOUND FALSE) - FIND_PROGRAM(Subversion_SVN_EXECUTABLE svn DOC "subversion command line client") 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 @@ -59,7 +56,6 @@ IF(Subversion_SVN_EXECUTABLE) 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 @@ -117,4 +113,6 @@ INCLUDE(FindPackageHandleStandardArgs) 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}) |