diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-09 14:37:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-09 14:37:09 (GMT) |
| commit | e5783a6f5144bf167534c72641c85a8af9a687a9 (patch) | |
| tree | 30e2641837cf1c1e07d3a5571917a45f48fba162 | |
| parent | ef2bb1c6ed39a593d29c1af0d5b878080581635e (diff) | |
| parent | f293d525a1ceb77e041ec71d8d83f8674916d406 (diff) | |
| download | CMake-e5783a6f5144bf167534c72641c85a8af9a687a9.zip CMake-e5783a6f5144bf167534c72641c85a8af9a687a9.tar.gz CMake-e5783a6f5144bf167534c72641c85a8af9a687a9.tar.bz2 | |
Merge topic 'multiarch-multios'
f293d52 GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels
| -rw-r--r-- | Modules/GNUInstallDirs.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake index c8d77c6..9f5b8a4 100644 --- a/Modules/GNUInstallDirs.cmake +++ b/Modules/GNUInstallDirs.cmake @@ -95,7 +95,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" # See http://wiki.debian.org/Multiarch - if(CMAKE_SYSTEM_NAME MATCHES "Linux" + if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" AND NOT CMAKE_CROSSCOMPILING) if (EXISTS "/etc/debian_version") # is this a debian system ? if(CMAKE_LIBRARY_ARCHITECTURE) |