[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6838-g7e68d77

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7e68d777d099d7abddc6c8e2ce4ddb3d5c35f44a (commit)
       via  f293d525a1ceb77e041ec71d8d83f8674916d406 (commit)
      from  b3f2a5c394feb0c0b3bf2d4cf11d97c31e18c64a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e68d777d099d7abddc6c8e2ce4ddb3d5c35f44a
commit 7e68d777d099d7abddc6c8e2ce4ddb3d5c35f44a
Merge: b3f2a5c f293d52
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 8 09:50:55 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 8 09:50:55 2014 -0500

    Merge topic 'multiarch-multios' into next
    
    f293d52 GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f293d525a1ceb77e041ec71d8d83f8674916d406
commit f293d525a1ceb77e041ec71d8d83f8674916d406
Author:     Dimitri John Ledkov <dimitri.ledkov at canonical.com>
AuthorDate: Fri Dec 13 17:09:51 2013 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 19 11:27:30 2013 -0500

    GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels

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)

-----------------------------------------------------------------------

Summary of changes:
 Modules/GNUInstallDirs.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake