diff options
| author | Brad King <brad.king@kitware.com> | 2007-06-27 16:07:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-06-27 16:07:34 (GMT) |
| commit | eab81489f10049fc1e97f65779adbca160fccf16 (patch) | |
| tree | eb40ef1065176de3b83865b9d0f0d3d8b4701a1c /Modules | |
| parent | 6352bd5cd34be913415303f078cd02b32b1b4e41 (diff) | |
| download | CMake-eab81489f10049fc1e97f65779adbca160fccf16.zip CMake-eab81489f10049fc1e97f65779adbca160fccf16.tar.gz CMake-eab81489f10049fc1e97f65779adbca160fccf16.tar.bz2 | |
ENH: Added global property FIND_LIBRARY_USE_LIB64_PATHS to allow lib64 paths to be searched optionally. Turn off the feature on debian systems. This addresses debian report 419007.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Linux.cmake | 6 | ||||
| -rw-r--r-- | Modules/Platform/UnixPaths.cmake | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake index 5378a9c..4de71d0 100644 --- a/Modules/Platform/Linux.cmake +++ b/Modules/Platform/Linux.cmake @@ -48,3 +48,9 @@ ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE) ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE) INCLUDE(Platform/UnixPaths) + +# Debian has lib64 paths only for compatibility so they should not be +# searched. +IF(EXISTS "/etc/debian_version") + SET_PROPERTIES(GLOBAL PROPERTIES FIND_LIBRARY_USE_LIB64_PATHS FALSE) +ENDIF(EXISTS "/etc/debian_version") diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake index cc1a9cd..c081407 100644 --- a/Modules/Platform/UnixPaths.cmake +++ b/Modules/Platform/UnixPaths.cmake @@ -37,3 +37,5 @@ SET(CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /lib /usr/lib /usr/lib32 /usr/lib64 ) +# Enable use of lib64 search path variants by default. +SET_PROPERTIES(GLOBAL PROPERTIES FIND_LIBRARY_USE_LIB64_PATHS TRUE) |