[Cmake-commits] CMake branch, next, updated. v2.8.4-1764-gacb5a93

[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  acb5a932f00eb65b0de0edbb1aea63cca83bfdbd (commit)
       via  93fc629adc7e90dce2c54592ae9ec0933adf6154 (commit)
      from  0cd72affbc1094dbfd4705ec10bec502b3ec6f1f (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=acb5a932f00eb65b0de0edbb1aea63cca83bfdbd
commit acb5a932f00eb65b0de0edbb1aea63cca83bfdbd
Merge: 0cd72af 93fc629
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 15 13:20:02 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 15 13:20:02 2011 -0400

    Merge topic 'FindJNI-Fedora-issue-12276' into next
    
    93fc629 FindJNI: Search in Fedora arch-specific JVM location (#12276)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93fc629adc7e90dce2c54592ae9ec0933adf6154
commit 93fc629adc7e90dce2c54592ae9ec0933adf6154
Author:     Christoph Höger <choeger at cs.tu-berlin.de>
AuthorDate: Wed Jun 15 13:18:14 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 15 13:18:14 2011 -0400

    FindJNI: Search in Fedora arch-specific JVM location (#12276)

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 5921101..d49b44a 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -105,6 +105,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
   /usr/local/lib
   /usr/lib/jvm/java/lib
   /usr/lib/java/jre/lib/{libarch}
+  /usr/lib/jvm/jre/lib/{libarch}
   /usr/local/lib/java/jre/lib/{libarch}
   /usr/local/share/java/jre/lib/{libarch}
   /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}

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

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


hooks/post-receive
-- 
CMake