[Cmake-commits] CMake branch, next, updated. v3.2.1-1134-gac6036b

[Zack Galbreath]

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  ac6036ba4216f1059b2e9531676de6a99e79227e (commit)
       via  e9a0668278007cde4aed343560344a99a61accbd (commit)
      from  c583042c126d064d75eb6cecefc80b4e644c2abd (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=ac6036ba4216f1059b2e9531676de6a99e79227e
commit ac6036ba4216f1059b2e9531676de6a99e79227e
Merge: c583042 e9a0668
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Fri Mar 20 15:16:31 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 20 15:16:31 2015 -0400

    Merge topic 'lib64_paths_crosscompiling' into next
    
    e9a06682 Ignore Debian-specific case when cross-compiling.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9a0668278007cde4aed343560344a99a61accbd
commit e9a0668278007cde4aed343560344a99a61accbd
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Fri Mar 20 15:13:33 2015 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Fri Mar 20 15:13:33 2015 -0400

    Ignore Debian-specific case when cross-compiling.

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:
 Modules/Platform/Linux.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake