FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix libsvn detection for some Linux distros

Browse Source 
Distros like Debian/Ubuntu use architecture-specific directory structures
(like /usr/lib/x86_64-linux-gnu) which we cannot hardcode/guess, so we
really need to search the default paths.
This commit is contained in:
ThorstenB 2012-09-03 23:51:38 +02:00
parent 9dd5b91cea
commit 78c0419007
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeModules/FindSvnClient.cmake
View File

@ -19,8 +19,13 @@ macro(find_static_component comp libs)
# NO_DEFAULT_PATH is important on Mac - we need to ensure subversion # NO_DEFAULT_PATH is important on Mac - we need to ensure subversion
# libraires in dist/ or Macports are picked over the Apple version # libraires in dist/ or Macports are picked over the Apple version
# in /usr, since that's what we will ship. # 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} FIND_LIBRARY(${compLibName}
if(APPLE)
NO_DEFAULT_PATH NO_DEFAULT_PATH
endif(APPLE)
NAMES ${compLib} NAMES ${compLib}
HINTS $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib HINTS $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib
PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64