[Cmake-commits] CMake branch, next, updated. v3.2.1-1170-ga5c530b

[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  a5c530b709838a32b3ee786774843b506dd0321b (commit)
       via  81bfebfe8c1cd568c945250ac26ac18d92fcd251 (commit)
      from  551dfb5692986403408793e051507b37a8b292a5 (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=a5c530b709838a32b3ee786774843b506dd0321b
commit a5c530b709838a32b3ee786774843b506dd0321b
Merge: 551dfb5 81bfebf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 23 09:22:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 23 09:22:01 2015 -0400

    Merge topic 'lib64_paths_crosscompiling' into next
    
    81bfebfe Linux: Ignore Debian-specific case when cross-compiling


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81bfebfe8c1cd568c945250ac26ac18d92fcd251
commit 81bfebfe8c1cd568c945250ac26ac18d92fcd251
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Fri Mar 20 15:13:33 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 23 09:19:54 2015 -0400

    Linux: Ignore Debian-specific case when cross-compiling
    
    When constructing settings for the target environment during cross
    compiling we should not check for /etc/debian_version on the host.

diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
index fe8e003..e40a74f 100644
--- a/Modules/Platform/Linux.cmake
+++ b/Modules/Platform/Linux.cmake
@@ -52,6 +52,6 @@ include(Platform/UnixPaths)
 
 # Debian has lib64 paths only for compatibility so they should not be
 # searched.
-if(EXISTS "/etc/debian_version")
+if(NOT CMAKE_CROSSCOMPILING AND EXISTS "/etc/debian_version")
   set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
 endif()

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

Summary of changes:


hooks/post-receive
-- 
CMake