[Cmake-commits] CMake branch, next, updated. v3.0.0-4030-g76ace1c

[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  76ace1c96f1112d54d3de915296b7c47b659df54 (commit)
       via  18ac6713e8657cca8fc791bcd581a47a7be6ebce (commit)
      from  4c5d48a66f93d79cb3866eb19b72a06346d64ed0 (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=76ace1c96f1112d54d3de915296b7c47b659df54
commit 76ace1c96f1112d54d3de915296b7c47b659df54
Merge: 4c5d48a 18ac671
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 1 08:36:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 1 08:36:51 2014 -0400

    Merge topic 'FindJNI-ppc64le' into next
    
    18ac6713 FindJNI: search for ppc64 on ppc64le as well


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18ac6713e8657cca8fc791bcd581a47a7be6ebce
commit 18ac6713e8657cca8fc791bcd581a47a7be6ebce
Author:     Dinar Valeev <dvaleev at suse.com>
AuthorDate: Mon Jun 30 18:29:20 2014 +0200
Commit:     Dinar Valeev <dvaleev at suse.com>
CommitDate: Tue Jul 1 12:07:37 2014 +0200

    FindJNI: search for ppc64 on ppc64le as well
    
    IcedTea 2.5 have changed libarch for ppc64le to ppc64. Adjust FindJNI
    to look for both for backward compatibility.
    
    Signed-off-by: Dinar Valeev <dvaleev at suse.com>

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 6a496af..3dcb0d0 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -55,7 +55,7 @@ macro(java_append_library_directories _var)
         # endianess of the underlying system.
         set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
-        set(_java_libarch "ppc64le")
+        set(_java_libarch "ppc64" "ppc64le")
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
         set(_java_libarch "ppc64" "ppc")
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")

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

Summary of changes:
 Modules/FindJNI.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake