[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6181-g8cb8b3b
Daniele E. Domenichelli
daniele.domenichelli at gmail.com
Wed Dec 11 08:10:56 EST 2013
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 8cb8b3b62ad3072c00dac34559c3e1851b4a46ca (commit)
via 62c276f03ef1c8c1c94c885cf2bcf3771f64ec35 (commit)
from 2f6589ebc298f1eca198dd6b18b9657e7cd2646f (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=8cb8b3b62ad3072c00dac34559c3e1851b4a46ca
commit 8cb8b3b62ad3072c00dac34559c3e1851b4a46ca
Merge: 2f6589e 62c276f
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Wed Dec 11 08:10:53 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 11 08:10:53 2013 -0500
Merge topic 'FindSubversion-TortoiseSVN' into next
62c276f FindSubversion: Use TortoiseSVN registry key to locate svn
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62c276f03ef1c8c1c94c885cf2bcf3771f64ec35
commit 62c276f03ef1c8c1c94c885cf2bcf3771f64ec35
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Dec 11 13:59:44 2013 +0100
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Dec 11 13:59:48 2013 +0100
FindSubversion: Use TortoiseSVN registry key to locate svn
If TortoiseSVN is not installed in the default path, the svn executable
installed by TortoiseSVN is not found.
Using the registry key should always find it.
diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake
index 2338721..0d13318 100644
--- a/Modules/FindSubversion.cmake
+++ b/Modules/FindSubversion.cmake
@@ -73,6 +73,8 @@
# License text for the above reference.)
find_program(Subversion_SVN_EXECUTABLE svn
+ PATHS
+ [HKEY_LOCAL_MACHINE\\Software\\TortoiseSVN;Directory]/bin
DOC "subversion command line client")
mark_as_advanced(Subversion_SVN_EXECUTABLE)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindSubversion.cmake | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list