kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'findsubversion_fphsa_cleanup' 

into ImprovedVersionCheckingInSomeModules

Conflicts:
	Modules/FindSubversion.cmake
This commit is contained in:
Brad King 2010-08-10 14:50:00 -04:00
parent b6c61561d6 a918bd5264
commit 430336c5e1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindSubversion.cmake
View File

@ -43,14 +43,11 @@
# (To distributed this file outside of CMake, substitute the full # (To distributed this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
SET(Subversion_SVN_FOUND FALSE)
FIND_PROGRAM(Subversion_SVN_EXECUTABLE svn FIND_PROGRAM(Subversion_SVN_EXECUTABLE svn
DOC "subversion command line client") DOC "subversion command line client")
MARK_AS_ADVANCED(Subversion_SVN_EXECUTABLE) MARK_AS_ADVANCED(Subversion_SVN_EXECUTABLE)
IF(Subversion_SVN_EXECUTABLE) IF(Subversion_SVN_EXECUTABLE)
SET(Subversion_SVN_FOUND TRUE)
EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} --version EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} --version
OUTPUT_VARIABLE Subversion_VERSION_SVN OUTPUT_VARIABLE Subversion_VERSION_SVN
@ -59,7 +56,6 @@ IF(Subversion_SVN_EXECUTABLE)
STRING(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*" STRING(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*"
"\\2" Subversion_VERSION_SVN "${Subversion_VERSION_SVN}") "\\2" Subversion_VERSION_SVN "${Subversion_VERSION_SVN}")
MACRO(Subversion_WC_INFO dir prefix) MACRO(Subversion_WC_INFO dir prefix)
# the subversion commands should be executed with the C locale, otherwise # the subversion commands should be executed with the C locale, otherwise
# the message (which are parsed) may be translated, Alex # 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 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Subversion REQUIRED_VARS Subversion_SVN_EXECUTABLE
VERSION_VAR Subversion_VERSION_SVN ) VERSION_VAR Subversion_VERSION_SVN )
# for compatibility
SET(Subversion_FOUND ${SUBVERSION_FOUND}) SET(Subversion_FOUND ${SUBVERSION_FOUND})
SET(Subversion_SVN_FOUND ${SUBVERSION_FOUND})