Fix SVN detection for Windows

diff --git a/CMakeModules/FindSvnClient.cmake b/CMakeModules/FindSvnClient.cmake
index f7d145ea80d107fbabd8a68b11c99ba19f4d73ad..153a81018e6c6843d5f8a8e44a1a1f2df5ab4f43 100644 (file)
--- a/CMakeModules/FindSvnClient.cmake
+++ b/CMakeModules/FindSvnClient.cmake
@@ -22,7 +22,7 @@ else(HAVE_APR_CONFIG)
     message(STATUS "apr-1-config not found, implement manual search for APR")
 endif(HAVE_APR_CONFIG)
 
-if(HAVE_APR_CONFIG) 
+if(HAVE_APR_CONFIG OR MSVC) 
        find_path(LIBSVN_INCLUDE_DIR svn_client.h
          HINTS
          $ENV{LIBSVN_DIR}
@@ -33,9 +33,15 @@ if(HAVE_APR_CONFIG)
          /opt
        )
 
-       check_library_exists(svn_client-1 svn_client_checkout "" HAVE_LIB_SVNCLIENT)
-       check_library_exists(svn_subr-1 svn_cmdline_init "" HAVE_LIB_SVNSUBR)
-       check_library_exists(svn_ra-1 svn_ra_initialize "" HAVE_LIB_SVNRA)
+       if (MSVC)
+               check_library_exists(libsvn_client-1 svn_client_checkout "${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib" HAVE_LIB_SVNCLIENT)
+               check_library_exists(libsvn_subr-1 svn_cmdline_init "${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib" HAVE_LIB_SVNSUBR)
+               check_library_exists(libsvn_ra-1 svn_ra_initialize "${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib" HAVE_LIB_SVNRA)
+       else (MSVC)
+               check_library_exists(svn_client-1 svn_client_checkout "" HAVE_LIB_SVNCLIENT)
+               check_library_exists(svn_subr-1 svn_cmdline_init "" HAVE_LIB_SVNSUBR)
+               check_library_exists(svn_ra-1 svn_ra_initialize "" HAVE_LIB_SVNRA)
+       endif (MSVC)
 
        include(FindPackageHandleStandardArgs)
        FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSVN DEFAULT_MSG 
@@ -47,5 +53,5 @@ if(HAVE_APR_CONFIG)
        if(LIBSVN_FOUND)
                set(LIBSVN_LIBRARIES "svn_client-1" "svn_subr-1" "svn_ra-1" ${APR_LIBS})
        endif(LIBSVN_FOUND)
-endif(HAVE_APR_CONFIG)
+endif(HAVE_APR_CONFIG OR MSVC)