Enable subversion lib packaging on Mac

diff --git a/CMakeModules/FindSvnClient.cmake b/CMakeModules/FindSvnClient.cmake
index 1135ee03bd1c30374dba0ed9c0e883d1a0c51b59..5a985c53041c879f9b2c59304ed733951cfa1417 100644 (file)
--- a/CMakeModules/FindSvnClient.cmake
+++ b/CMakeModules/FindSvnClient.cmake
@@ -16,14 +16,18 @@ 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.
     FIND_LIBRARY(${compLibName}
+      NO_DEFAULT_PATH
       NAMES ${compLib}
-      HINTS $ENV{PLIBDIR}
+      HINTS $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} 
       PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
       PATHS
+      /opt/local
       /usr/local
       /usr
-      /opt
     )
 
        list(APPEND ${libs} ${${compLibName}})
@@ -49,13 +53,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}
          PATH_SUFFIXES include/subversion-1
          PATHS
+      /opt/local
          /usr/local
          /usr
-         /opt
        )
        
        set(LIBSVN_LIBRARIES "")
@@ -70,8 +75,7 @@ if(HAVE_APR_CONFIG OR MSVC)
 
        include(FindPackageHandleStandardArgs)
        FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSVN DEFAULT_MSG LIBSVN_LIBRARIES LIBSVN_INCLUDE_DIR)
-       if(NOT LIBSVN_FOUND)
+        if(NOT LIBSVN_FOUND)
                set(LIBSVN_LIBRARIES "")
-       endif(NOT LIBSVN_FOUND)
-
+        endif(NOT LIBSVN_FOUND)
 endif(HAVE_APR_CONFIG OR MSVC)

diff --git a/package/mac/build-mac-nightly-dmg.rb b/package/mac/build-mac-nightly-dmg.rb
index 568a3820014dacf80140a5f942779ad91d6c0de8..a694fa251f63abfc4113f3002a9a8d9649bfc131 100755 (executable)
--- a/package/mac/build-mac-nightly-dmg.rb
+++ b/package/mac/build-mac-nightly-dmg.rb
@@ -122,8 +122,7 @@ $osgPlugins.each do |p|
   fix_install_names("#{osgPluginsDir}/#{pluginFile}")
 end
 
-# svn lib copying disabled for the moment
-# copy_svn_libs()
+copy_svn_libs()
 
 # custom ALUT
 # must copy frameworks using ditto