From 1666ea8286e761ad6c5a9ca4030a85af5de411e3 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Mon, 13 Aug 2012 22:15:53 +0200 Subject: [PATCH] Restore auto-detection of SVN libs on Windows --- CMakeModules/FindSvnClient.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeModules/FindSvnClient.cmake b/CMakeModules/FindSvnClient.cmake index 5a985c530..c3a4bc11a 100644 --- a/CMakeModules/FindSvnClient.cmake +++ b/CMakeModules/FindSvnClient.cmake @@ -22,7 +22,7 @@ macro(find_static_component comp libs) FIND_LIBRARY(${compLibName} NO_DEFAULT_PATH NAMES ${compLib} - HINTS $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} + HINTS $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 PATHS /opt/local @@ -55,7 +55,7 @@ if(HAVE_APR_CONFIG OR MSVC) find_path(LIBSVN_INCLUDE_DIR svn_client.h NO_DEFAULT_PATH HINTS - $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} + $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib PATH_SUFFIXES include/subversion-1 PATHS /opt/local