]> git.mxchange.org Git - flightgear.git/commitdiff
Restore auto-detection of SVN libs on Windows
authorFrederic Bouvier <fredfgfs01@free.fr>
Mon, 13 Aug 2012 20:15:53 +0000 (22:15 +0200)
committerFrederic Bouvier <fredfgfs01@free.fr>
Mon, 13 Aug 2012 20:16:17 +0000 (22:16 +0200)
CMakeModules/FindSvnClient.cmake

index 5a985c53041c879f9b2c59304ed733951cfa1417..c3a4bc11ab36f32bba13cecb13805e2951f2f43d 100644 (file)
@@ -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