fly/flightgear
1
0
Fork 0
Code Activity

Enable subversion lib packaging on Mac

Browse source
This commit is contained in:
James Turner 2012-08-11 15:23:17 +01:00
parent b7b4553db6
commit 9c2d01189e
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CMakeModules/FindSvnClient.cmake
View file

@ -16,14 +16,18 @@ macro(find_static_component comp libs)
string(TOUPPER "${comp}" compLibBase) string(TOUPPER "${comp}" compLibBase)
set( compLibName ${compLibBase}_LIBRARY ) 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} FIND_LIBRARY(${compLibName}
NO_DEFAULT_PATH
NAMES ${compLib} NAMES ${compLib}
HINTS $ENV{PLIBDIR} HINTS $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX}
PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
PATHS PATHS
/opt/local
/usr/local /usr/local
/usr /usr
/opt
) )
list(APPEND ${libs} ${${compLibName}}) list(APPEND ${libs} ${${compLibName}})
@ -49,13 +53,14 @@ endif(HAVE_APR_CONFIG)
if(HAVE_APR_CONFIG OR MSVC) if(HAVE_APR_CONFIG OR MSVC)
find_path(LIBSVN_INCLUDE_DIR svn_client.h find_path(LIBSVN_INCLUDE_DIR svn_client.h
NO_DEFAULT_PATH
HINTS HINTS
$ENV{LIBSVN_DIR} $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX}
PATH_SUFFIXES include/subversion-1 PATH_SUFFIXES include/subversion-1
PATHS PATHS
/opt/local
/usr/local /usr/local
/usr /usr
/opt
) )
set(LIBSVN_LIBRARIES "") set(LIBSVN_LIBRARIES "")
@ -70,8 +75,7 @@ if(HAVE_APR_CONFIG OR MSVC)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSVN DEFAULT_MSG LIBSVN_LIBRARIES LIBSVN_INCLUDE_DIR) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSVN DEFAULT_MSG LIBSVN_LIBRARIES LIBSVN_INCLUDE_DIR)
if(NOT LIBSVN_FOUND) if(NOT LIBSVN_FOUND)
set(LIBSVN_LIBRARIES "") set(LIBSVN_LIBRARIES "")
endif(NOT LIBSVN_FOUND) endif(NOT LIBSVN_FOUND)
endif(HAVE_APR_CONFIG OR MSVC) endif(HAVE_APR_CONFIG OR MSVC)

3
package/mac/build-mac-nightly-dmg.rb
View file

@ -122,8 +122,7 @@ $osgPlugins.each do |p|
fix_install_names("#{osgPluginsDir}/#{pluginFile}") fix_install_names("#{osgPluginsDir}/#{pluginFile}")
end end
# svn lib copying disabled for the moment copy_svn_libs()
# copy_svn_libs()
# custom ALUT # custom ALUT
# must copy frameworks using ditto # must copy frameworks using ditto