[Cmake-commits] CMake branch, next, updated. v2.8.4-1733-g412fbe5

[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  412fbe5892aa00eea675a464130c75b20d2765a5 (commit)
       via  1ed19bcb25edc5f1911b5d0237db34426e747cd2 (commit)
      from  9faa59d3e89e47e24b9deb535d00070b65e9a017 (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=412fbe5892aa00eea675a464130c75b20d2765a5
commit 412fbe5892aa00eea675a464130c75b20d2765a5
Merge: 9faa59d 1ed19bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 13 11:38:06 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 13 11:38:06 2011 -0400

    Merge topic 'library-multiarch-issue-12037' into next
    
    1ed19bc multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSD


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ed19bcb25edc5f1911b5d0237db34426e747cd2
commit 1ed19bcb25edc5f1911b5d0237db34426e747cd2
Author:     Modestas Vainius <modax at debian.org>
AuthorDate: Sun Jun 12 17:40:01 2011 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 13 11:12:23 2011 -0400

    multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSD
    
    * Fix linux CMAKE_LIBRARY_ARCHITECTURE_REGEX to support armel-linux-gnueabi.
    * Add CMAKE_LIBRARY_ARCHITECTURE_REGEX on kFreeBSD.
    * Add CMAKE_LIBRARY_ARCHITECTURE_REGEX on GNU (Hurd).
    
    Also regex is improved to support quadlets.  Even if I have not seen this
    in the wild yet, reportedly they are possible.

diff --git a/Modules/Platform/GNU.cmake b/Modules/Platform/GNU.cmake
index e0ed86c..4bcfd51 100644
--- a/Modules/Platform/GNU.cmake
+++ b/Modules/Platform/GNU.cmake
@@ -8,4 +8,6 @@ SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
 SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
 SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
 
+SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-gnu[a-z0-9_]*")
+
 INCLUDE(Platform/UnixPaths)
diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
index 57d1b34..38f469b 100644
--- a/Modules/Platform/Linux.cmake
+++ b/Modules/Platform/Linux.cmake
@@ -46,7 +46,7 @@ ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE)
 ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
 
 # Match multiarch library directory names.
-SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+-linux-gnu")
+SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*")
 
 INCLUDE(Platform/UnixPaths)
 
diff --git a/Modules/Platform/kFreeBSD.cmake b/Modules/Platform/kFreeBSD.cmake
index ff050de..c1295fb 100644
--- a/Modules/Platform/kFreeBSD.cmake
+++ b/Modules/Platform/kFreeBSD.cmake
@@ -1,2 +1,4 @@
 # kFreeBSD looks just like Linux.
 INCLUDE(Platform/Linux)
+
+SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-kfreebsd-gnu[a-z0-9_]*")

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

Summary of changes:
 Modules/Platform/GNU.cmake      |    2 ++
 Modules/Platform/Linux.cmake    |    2 +-
 Modules/Platform/kFreeBSD.cmake |    2 ++
 3 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake