[Cmake-commits] CMake branch, next, updated. v2.8.4-1383-g8e0591a

[Mathieu Malaterre]

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  8e0591a7fa3c7c7ad96d03a0e5bdccfbeb7756f7 (commit)
       via  a59d198aa37950fe7048986619c5108384b9deda (commit)
      from  20118bf3a1eb9c84a44a224f326789c9b90d176e (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=8e0591a7fa3c7c7ad96d03a0e5bdccfbeb7756f7
commit 8e0591a7fa3c7c7ad96d03a0e5bdccfbeb7756f7
Merge: 20118bf a59d198
Author:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Fri Apr 8 09:13:34 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 8 09:13:34 2011 -0400

    Merge topic 'fixbug_0011183' into next
    
    a59d198 Add support for java on fedora


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a59d198aa37950fe7048986619c5108384b9deda
commit a59d198aa37950fe7048986619c5108384b9deda
Author:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Mon Mar 28 17:39:27 2011 +0200
Commit:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
CommitDate: Fri Apr 8 15:12:23 2011 +0200

    Add support for java on fedora
    
    This commit fixes BUG: 0011183 by adding new paths used on fedora,
    specifically: /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 6ba1826..cf88764 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -114,6 +114,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
   /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
   /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch}       # can this one be removed according to #8821 ? Alex
   /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
+  /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch}        # fedora
   # Debian specific paths for default JVM
   /usr/lib/jvm/default-java/jre/lib/{libarch}
   /usr/lib/jvm/default-java/jre/lib

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

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


hooks/post-receive
-- 
CMake