Build Terrasync with libsvnclient under Windows

diff --git a/CMakeModules/FindSvnClient.cmake b/CMakeModules/FindSvnClient.cmake
index 717b8b04d0d749b3b0e1fdd849de65eed1fbab7e..4b5e21a5de3de29d02e9e4c625b39948491147f4 100644 (file)
--- a/CMakeModules/FindSvnClient.cmake
+++ b/CMakeModules/FindSvnClient.cmake
@@ -19,7 +19,17 @@ if(HAVE_APR_CONFIG)
        string(STRIP ${RAW_APR_LIBS} APR_LIBS)
 
 else(HAVE_APR_CONFIG)
-    message(STATUS "apr-1-config not found, implement manual search for APR")
+       FIND_LIBRARY(APR_LIBS
+         NAMES libapr-1 apr-1
+         HINTS
+         PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
+         PATHS
+         ~/Library/Frameworks
+         /Library/Frameworks
+         /usr/local
+         /usr
+         /opt
+       )
 endif(HAVE_APR_CONFIG)
 
 find_path(LIBSVN_INCLUDE_DIR svn_client.h
@@ -32,17 +42,53 @@ find_path(LIBSVN_INCLUDE_DIR svn_client.h
   /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)
+FIND_LIBRARY(SVNCLIENT_LIBRARY
+  NAMES libsvn_client-1 svn_client-1
+  HINTS
+  PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /opt
+)
+
+FIND_LIBRARY(SVNSUBR_LIBRARY
+  NAMES libsvn_subr-1 svn_subr-1
+  HINTS
+  PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /opt
+)
+
+FIND_LIBRARY(SVNRA_LIBRARY
+  NAMES libsvn_ra-1 svn_ra-1
+  HINTS
+  PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /opt
+)
 
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSVN DEFAULT_MSG 
-    HAVE_LIB_SVNSUBR 
-    HAVE_LIB_SVNCLIENT
-    HAVE_LIB_SVNRA 
+    SVNSUBR_LIBRARY 
+    SVNCLIENT_LIBRARY
+    SVNRA_LIBRARY 
     LIBSVN_INCLUDE_DIR)
 
 if(LIBSVN_FOUND)
-    set(LIBSVN_LIBRARIES "svn_client-1" "svn_subr-1" "svn_ra-1" ${APR_LIBS})
+    message(STATUS "LIBSVN_FOUND 1")
+
+       set(LIBSVN_LIBRARIES ${SVNCLIENT_LIBRARY} ${SVNSUBR_LIBRARY} ${SVNRA_LIBRARY} ${APR_LIBS})
+else(LIBSVN_FOUND)
+    message(STATUS "LIBSVN_FOUND 0")
 endif(LIBSVN_FOUND)