Merge topic 'multiarch-multios'

f293d52 GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels
This commit is contained in:
Brad King 2014-01-09 09:37:09 -05:00 committed by CMake Topic Stage
commit e5783a6f51
1 changed files with 1 additions and 1 deletions

View File

@ -95,7 +95,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
# See http://wiki.debian.org/Multiarch # See http://wiki.debian.org/Multiarch
if(CMAKE_SYSTEM_NAME MATCHES "Linux" if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
AND NOT CMAKE_CROSSCOMPILING) AND NOT CMAKE_CROSSCOMPILING)
if (EXISTS "/etc/debian_version") # is this a debian system ? if (EXISTS "/etc/debian_version") # is this a debian system ?
if(CMAKE_LIBRARY_ARCHITECTURE) if(CMAKE_LIBRARY_ARCHITECTURE)