Updated package-management code.

[simgear.git] / CMakeModules / FindSvnClient.cmake

diff --git a/CMakeModules/FindSvnClient.cmake b/CMakeModules/FindSvnClient.cmake
index 15f6ba27a630dd2c4ff687e0839c76edd1549bdb..c7fa89bb218e85662facbb39cbeb64f44403a32d 100644 (file)
--- a/CMakeModules/FindSvnClient.cmake
+++ b/CMakeModules/FindSvnClient.cmake
@@ -16,14 +16,20 @@ macro(find_static_component comp libs)
     string(TOUPPER "${comp}" compLibBase)
     set( compLibName ${compLibBase}_LIBRARY )
 
+    # NO_DEFAULT_PATH is important on Mac - we need to ensure subversion
+    # libraires in dist/ or Macports are picked over the Apple version 
+    # in /usr, since that's what we will ship.
+    # On other platforms we do need default paths though, i.e. since Linux
+    # distros may use architecture-specific directories (like
+    # /usr/lib/x86_64-linux-gnu) which we cannot hardcode/guess here.
     FIND_LIBRARY(${compLibName}
+if(APPLE)
+      NO_DEFAULT_PATH
+endif(APPLE)
       NAMES ${compLib}
-      HINTS $ENV{PLIBDIR}
+      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
-      /usr/local
-      /usr
-      /opt
+      PATHS ${ADDITIONAL_LIBRARY_PATHS}
     )
 
        list(APPEND ${libs} ${${compLibName}})
@@ -49,13 +55,14 @@ endif(HAVE_APR_CONFIG)
 
 if(HAVE_APR_CONFIG OR MSVC)
        find_path(LIBSVN_INCLUDE_DIR svn_client.h
+      NO_DEFAULT_PATH
          HINTS
-         $ENV{LIBSVN_DIR}
+         $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include
          PATH_SUFFIXES include/subversion-1
          PATHS
+      /opt/local
          /usr/local
          /usr
-         /opt
        )
        
        set(LIBSVN_LIBRARIES "")