diff options
| author | Brad King <brad.king@kitware.com> | 2011-06-08 12:46:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-06-08 14:04:44 (GMT) |
| commit | b41ad3b399c591f8f35eaacf056ffd9016b9e0bc (patch) | |
| tree | 5d44f207b90ac15c1ed6b34358cdfe62e7e9ca27 /Modules/Platform | |
| parent | 0f939ee16478ad638bb380a75b4867b072a09306 (diff) | |
| download | CMake-b41ad3b399c591f8f35eaacf056ffd9016b9e0bc.zip CMake-b41ad3b399c591f8f35eaacf056ffd9016b9e0bc.tar.gz CMake-b41ad3b399c591f8f35eaacf056ffd9016b9e0bc.tar.bz2 | |
Teach find_(library|package) about Linux multiarch (#12037)
Implement support for multiarch as specified here:
http://wiki.debian.org/Multiarch
https://wiki.ubuntu.com/MultiarchSpec
Detect the <arch> part of <prefix>/lib/<arch> from the implicit library
search path from each compiler to set CMAKE_<lang>_LIBRARY_ARCHITECTURE.
Define CMAKE_LIBRARY_ARCHITECTURE using one of these values (they should
all be the same). Teach the find_library and find_package commands to
search <prefix>/lib/<arch> whenever they would search <prefix>/lib.
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Linux.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake index 6490dd1..57d1b34 100644 --- a/Modules/Platform/Linux.cmake +++ b/Modules/Platform/Linux.cmake @@ -45,6 +45,9 @@ ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE) ENDIF(EXISTS "/etc/debian_version") ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE) +# Match multiarch library directory names. +SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+-linux-gnu") + INCLUDE(Platform/UnixPaths) # Debian has lib64 paths only for compatibility so they should not be |